diff --git a/CMakeLists.txt b/CMakeLists.txt
index 187fd882..327280ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0042 NEW)
 
 project(mosquitto)
-set (VERSION 2.0.4)
+set (VERSION 2.0.5)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
 
diff --git a/ChangeLog.txt b/ChangeLog.txt
index c5f7c6b2..8e7f05d5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2.0.5 - 2021-01-11
+==================
+
 Broker:
 - Fix `auth_method` not being provided to the extended auth plugin event.
   Closes #1975.
@@ -12,6 +15,7 @@ Broker:
 - Fix invalid behaviour in dynsec plugin if a group or client is deleted
   before a role that was attached to the group or client is deleted.
   Closes #1998.
+- Improve logging in dynsec addGroupRole command. Closes #2005.
 
 Client library:
 - Improve documentation around the `_v5()` and non-v5 functions, e.g.
diff --git a/config.mk b/config.mk
index a807c606..178c8baa 100644
--- a/config.mk
+++ b/config.mk
@@ -125,7 +125,7 @@ WITH_XTREPORT=no
 
 # Also bump lib/mosquitto.h, CMakeLists.txt,
 # installer/mosquitto.nsi, installer/mosquitto64.nsi
-VERSION=2.0.4
+VERSION=2.0.5
 
 # Client library SO version. Bump if incompatible API/ABI changes are made.
 SOVERSION=1
diff --git a/include/mosquitto.h b/include/mosquitto.h
index d6209e9b..cd10ea60 100644
--- a/include/mosquitto.h
+++ b/include/mosquitto.h
@@ -66,7 +66,7 @@ extern "C" {
 
 #define LIBMOSQUITTO_MAJOR 2
 #define LIBMOSQUITTO_MINOR 0
-#define LIBMOSQUITTO_REVISION 4
+#define LIBMOSQUITTO_REVISION 5
 /* 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/installer/mosquitto.nsi b/installer/mosquitto.nsi
index 2498c845..0ad72cd4 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 2.0.4
+!define VERSION 2.0.5
 OutFile "mosquitto-${VERSION}-install-windows-x86.exe"
 
 InstallDir "$PROGRAMFILES\mosquitto"
diff --git a/installer/mosquitto64.nsi b/installer/mosquitto64.nsi
index 783c2e66..4bf999ee 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 2.0.4
+!define VERSION 2.0.5
 OutFile "mosquitto-${VERSION}-install-windows-x64.exe"
 
 !include "x64.nsh"
diff --git a/set-version.sh b/set-version.sh
index a062b1ad..dc6cf349 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -2,7 +2,7 @@
 
 MAJOR=2
 MINOR=0
-REVISION=4
+REVISION=5
 
 sed -i "s/^VERSION=.*/VERSION=${MAJOR}.${MINOR}.${REVISION}/" config.mk
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0e485bdf..41495ef2 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: mosquitto
-version: 2.0.4
+version: 2.0.5
 summary: Eclipse Mosquitto MQTT broker
 description: This is a message broker that supports version 5.0, 3.1.1, and 3.1 of the MQTT
     protocol.
diff --git a/www/pages/download.md b/www/pages/download.md
index fb141c5d..526847b8 100644
--- a/www/pages/download.md
+++ b/www/pages/download.md
@@ -1,7 +1,7 @@
 <!--
 .. title: Download
 .. slug: download
-.. date: 2020-12-22 16:52:38 UTC
+.. date: 2021-01-11 10:29:38 UTC
 .. tags: tag
 .. category: category
 .. link: link
@@ -11,7 +11,7 @@
 
 # Source
 
-* [mosquitto-2.0.4.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.4.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.4.tar.gz.asc))
+* [mosquitto-2.0.5.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.5.tar.gz) (319kB) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.5.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-2.0.4-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.4-install-windows-x64.exe) (64-bit build, Windows Vista and up, built with Visual Studio Community 2019)
-* [mosquitto-2.0.4-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-2.0.4-install-windows-x86.exe) (32-bit build, Windows Vista and up, built with Visual Studio Community 2019)
+* [mosquitto-2.0.5-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.5-install-windows-x64.exe) (64-bit build, Windows Vista and up, built with Visual Studio Community 2019)
+* [mosquitto-2.0.5-install-windows-x32.exe](https://mosquitto.org/files/binary/win32/mosquitto-2.0.5-install-windows-x86.exe) (32-bit build, Windows Vista and up, built with Visual Studio Community 2019)
 
 Older installers can be found at [https://mosquitto.org/files/binary/](https://mosquitto.org/files/binary/).
 
diff --git a/www/posts/2020/12/version-2-0-4-released.md b/www/posts/2020/12/version-2-0-4-released.md
index dcbc6b2a..9cb2686e 100644
--- a/www/posts/2020/12/version-2-0-4-released.md
+++ b/www/posts/2020/12/version-2-0-4-released.md
@@ -13,17 +13,17 @@ Version 2.0.4 of Mosquitto has been released. This is a bugfix release.
 
 # Broker
 - Fix $SYS/broker/publish/messages/+ counters not being updated for QoS 1, 2
-  messages. Closes #1968.
+  messages. Closes [#1968].
 - `mosquitto_connect_bind_async()` and `mosquitto_connect_bind_v5()` should not
   reset the bind address option if called with `bind_address == NULL`.
 - Fix dynamic security configuration possibly not being reloaded on Windows
-  only. Closes #1962.
+  only. Closes [#1962].
 - Add more log messages for dynsec load/save error conditions.
 - Fix websockets connections blocking non-websockets connections on Windows.
-  Closes #1934.
+  Closes [#1934].
 
 # Build
-- Fix man pages not being built when using CMake. Closes #1969.
+- Fix man pages not being built when using CMake. Closes [#1969].
 
 [#1934]: https://github.com/eclipse/mosquitto/issues/1934
 [#1962]: https://github.com/eclipse/mosquitto/issues/1962
diff --git a/www/posts/2021/01/version-2-0-5-released.md b/www/posts/2021/01/version-2-0-5-released.md
new file mode 100644
index 00000000..23886ce2
--- /dev/null
+++ b/www/posts/2021/01/version-2-0-5-released.md
@@ -0,0 +1,54 @@
+<!--
+.. title: Version 2.0.5 released.
+.. slug: version-2-0-3-released
+.. date: 2021-01-11 10:29:16 UTC+00:00
+.. tags: Releases
+.. category:
+.. link:
+.. description:
+.. type: text
+-->
+
+Version 2.0.5 of Mosquitto has been released. This is a bugfix release.
+
+# Broker
+- Fix `auth_method` not being provided to the extended auth plugin event.
+  Closes [#1975].
+- Fix large packets not being completely published to slow clients.
+  Closes [#1977].
+- Fix bridge connection not relinquishing POLLOUT after messages are sent.
+  Closes [#1979].
+- Fix apparmor incorrectly denying access to
+  /var/lib/mosquitto/mosquitto.db.new. Closes [#1978].
+- Fix potential intermittent initial bridge connections when using poll().
+- Fix `bind_interface` option. Closes [#1999].
+- Fix invalid behaviour in dynsec plugin if a group or client is deleted
+  before a role that was attached to the group or client is deleted.
+  Closes [#1998].
+- Improve logging in dynsec addGroupRole command. Closes [#2005].
+
+# Client library
+- Improve documentation around the `_v5()` and non-v5 functions, e.g.
+  `mosquitto_publish()` and `mosquitto_publish_v5().
+
+# Build
+- `install` Makefile target should depend on `all`, not `mosquitto`, to ensure
+  that man pages are always built. Closes [#1989].
+- Fixes for lots of minor build warnings highlighted by Visual Studio. 
+
+# Apps
+- Disallow control characters in mosquitto_passwd usernames.
+- Fix incorrect description in mosquitto_ctrl man page. Closes [#1995].
+- Fix `mosquitto_ctrl dynsec getGroup` not showing roles. Closes [#1997].
+
+
+[#1975]: https://github.com/eclipse/mosquitto/issues/1975
+[#1977]: https://github.com/eclipse/mosquitto/issues/1977
+[#1978]: https://github.com/eclipse/mosquitto/issues/1978
+[#1979]: https://github.com/eclipse/mosquitto/issues/1979
+[#1989]: https://github.com/eclipse/mosquitto/issues/1989
+[#1995]: https://github.com/eclipse/mosquitto/issues/1995
+[#1997]: https://github.com/eclipse/mosquitto/issues/1997
+[#1998]: https://github.com/eclipse/mosquitto/issues/1998
+[#1999]: https://github.com/eclipse/mosquitto/issues/1999
+[#2005]: https://github.com/eclipse/mosquitto/issues/2005