diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05fdc0e2..8528eeee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 2.8)
 # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.6.0)
+set (VERSION 1.6.1)
 
 add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
 
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f908c54b..7d92cf55 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-1.6.1 - 201905xx
+1.6.1 - 20190426
 ================
 
 Broker:
diff --git a/config.mk b/config.mk
index 14266dad..ff6acf22 100644
--- a/config.mk
+++ b/config.mk
@@ -104,7 +104,7 @@ WITH_COVERAGE:=no
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto64.nsi
-VERSION=1.6.0
+VERSION=1.6.1
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
 SOVERSION=1
diff --git a/installer/mosquitto.nsi b/installer/mosquitto.nsi
index ecd0cd0b..9eea548b 100644
--- a/installer/mosquitto.nsi
+++ b/installer/mosquitto.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 1.6.0
+!define VERSION 1.6.1
 OutFile "mosquitto-${VERSION}-install-windows-x86.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index 7856cf56..e254787f 100644
--- a/installer/mosquitto64.nsi
+++ b/installer/mosquitto64.nsi
@@ -9,7 +9,7 @@
 !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
 
 Name "Eclipse Mosquitto"
-!define VERSION 1.6.0
+!define VERSION 1.6.1
 OutFile "mosquitto-${VERSION}-install-windows-x64.exe"
 
 !include "x64.nsh"
diff --git a/lib/mosquitto.h b/lib/mosquitto.h
index f1e15083..2748aded 100644
--- a/lib/mosquitto.h
+++ b/lib/mosquitto.h
@@ -48,7 +48,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 1
 #define LIBMOSQUITTO_MINOR 6
-#define LIBMOSQUITTO_REVISION 0
+#define LIBMOSQUITTO_REVISION 1
 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */
 #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION)
 
diff --git a/set-version.sh b/set-version.sh
index a45ab7e6..426c9a5b 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=1
 MINOR=6
-REVISION=0
+REVISION=1
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5a38ca4d..9c992d51 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mosquitto
-version: 1.6.0
+version: 1.6.1
 summary: Eclipse Mosquitto MQTT broker
 description: This is a message broker that supports version 3.1 and 3.1.1 of the MQTT
     protocol.
diff --git a/www/pages/download.md b/www/pages/download.md
index 59201a33..ee1087a3 100644
--- a/www/pages/download.md
+++ b/www/pages/download.md
@@ -1,7 +1,7 @@
 <!--
 .. title: Download
 .. slug: download
-.. date: 2019-04-17 21:57:00 UTC+1
+.. date: 2019-04-26 16:41:00 UTC+1
 .. tags: tag
 .. category: category
 .. link: link
@@ -11,7 +11,7 @@
 
 # Source
 
-* [mosquitto-1.6.0.tar.gz](https://mosquitto.org/files/source/mosquitto-1.6.0.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-1.6.0.tar.gz.asc))
+* [mosquitto-1.6.1.tar.gz](https://mosquitto.org/files/source/mosquitto-1.6.1.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-1.6.1.tar.gz.asc))
 * [Git source code repository](https://github.com/eclipse/mosquitto) (github.com)
 
 Older downloads are available at [https://mosquitto.org/files/](../files/)
@@ -24,8 +24,8 @@ distributions.
 
 ## Windows
 
-* [mosquitto-1.6.0-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-1.6.0-install-windows-x64.exe) (~360 kB) (64-bit build, Windows Vista and up, built with Visual Studio Community 2017)
-* [mosquitto-1.6.0-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-1.6.0-install-windows-x86.exe) (~360 kB) (32-bit build, Windows Vista and up, built with Visual Studio Community 2017)
+* [mosquitto-1.6.1-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-1.6.1-install-windows-x64.exe) (~360 kB) (64-bit build, Windows Vista and up, built with Visual Studio Community 2017)
+* [mosquitto-1.6.1-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-1.6.1-install-windows-x86.exe) (~360 kB) (32-bit build, Windows Vista and up, built with Visual Studio Community 2017)
 
 See also readme-windows.txt after installing.
 
diff --git a/www/posts/2019/04/version-1-6-1-released.md b/www/posts/2019/04/version-1-6-1-released.md
new file mode 100644
index 00000000..a432f410
--- /dev/null
+++ b/www/posts/2019/04/version-1-6-1-released.md
@@ -0,0 +1,34 @@
+<!--
+.. title: Version 1.6.1 released
+.. slug: version-1-6-1-released
+.. date: 2019-04-26 16:37:00 UTC+1
+.. tags: Releases
+.. category:
+.. link:
+.. description:
+.. type: text
+-->
+
+This is a minor service release. The fixes are only related to documentation
+and the build process, and so is primarily of interest for people building
+Mosquitto.
+
+## Broker
+- Document `memory_limit` option.
+
+## Clients
+- Fix compilation on non glibc systems due to missing sys/time.h header.
+
+## Build:
+- Add `make check` target and document testing procedure. Closes [#1230].
+- Document bundled dependencies and how to disable. Closes [#1231].
+- Split CFLAGS and CPPFLAGS, and LDFLAGS and LDADD/LIBADD.
+- test/unit now respects CPPFLAGS and LDFLAGS. Closes [#1232].
+- Don't call ldconfig in CMake scripts. Closes [#1048].
+- Use `CMAKE_INSTALL_*` variables when installing in CMake. Closes [#1049].
+
+[#1048]: https://github.com/eclipse/mosquitto/issues/1048
+[#1049]: https://github.com/eclipse/mosquitto/issues/1049
+[#1230]: https://github.com/eclipse/mosquitto/issues/1230
+[#1231]: https://github.com/eclipse/mosquitto/issues/1231
+[#1232]: https://github.com/eclipse/mosquitto/issues/1232