diff --git a/ChangeLog.txt b/ChangeLog.txt
index 271f71b8..0c724cb2 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,4 +1,4 @@
-2.0.20 - 2024-10-xx
+2.0.20 - 2024-10-16
 ===================
 
 Broker:
diff --git a/apps/db_dump/Makefile b/apps/db_dump/Makefile
index 1064e6e8..913dd12a 100644
--- a/apps/db_dump/Makefile
+++ b/apps/db_dump/Makefile
@@ -18,6 +18,7 @@ OBJS = \
 	   stubs.o \
 	   time_mosq.o \
 	   topic_tok.o \
+	   util_topic.o \
 	   utf8_mosq.o
 
 .PHONY: all clean reallyclean
@@ -75,6 +76,9 @@ time_mosq.o : ../../lib/time_mosq.c
 topic_tok.o : ../../src/topic_tok.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
+util_topic.o : ../../lib/util_topic.c
+	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
+
 utf8_mosq.o : ../../lib/utf8_mosq.c
 	${CROSS_COMPILE}${CC} $(CFLAGS_FINAL) -c $< -o $@
 
diff --git a/test/unit/Makefile b/test/unit/Makefile
index 41bc6057..f2d20201 100644
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -58,6 +58,7 @@ PERSIST_READ_OBJS = \
 		retain.o \
 		topic_tok.o \
 		utf8_mosq.o \
+		util_topic.o \
 		util_mosq.o
 
 PERSIST_WRITE_TEST_OBJS = \
@@ -80,6 +81,7 @@ PERSIST_WRITE_OBJS = \
 		subs.o \
 		topic_tok.o \
 		utf8_mosq.o \
+		util_topic.o \
 		util_mosq.o
 
 TLS_TEST_OBJS = \
diff --git a/www/pages/download.md b/www/pages/download.md
index a7cb0eae..3200eba4 100644
--- a/www/pages/download.md
+++ b/www/pages/download.md
@@ -11,7 +11,7 @@
 
 # Source
 
-* [mosquitto-2.0.19.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.19.tar.gz) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.19.tar.gz.asc))
+* [mosquitto-2.0.20.tar.gz](https://mosquitto.org/files/source/mosquitto-2.0.20.tar.gz) ([GPG signature](https://mosquitto.org/files/source/mosquitto-2.0.20.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,7 +24,7 @@ distributions.
 
 ## Windows
 
-* [mosquitto-2.0.19-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.19-install-windows-x64.exe)
+* [mosquitto-2.0.20-install-windows-x64.exe](https://mosquitto.org/files/binary/win64/mosquitto-2.0.20-install-windows-x64.exe)
 
 Older installers can be found at [https://mosquitto.org/files/binary/](https://mosquitto.org/files/binary/).
 
diff --git a/www/posts/2024/10/version-2-0-20-released.md b/www/posts/2024/10/version-2-0-20-released.md
index c677993c..1455a3d4 100644
--- a/www/posts/2024/10/version-2-0-20-released.md
+++ b/www/posts/2024/10/version-2-0-20-released.md
@@ -1,7 +1,7 @@
 <!--
 .. title: Version 2.0.20 released.
 .. slug: version-2-0-20-released
-.. date: 2024-10-11 18:22:38 UTC+1
+.. date: 2024-10-16 17:11:38 UTC+1
 .. tags: Releases
 .. category:
 .. link:
@@ -12,12 +12,19 @@
 Version 2.0.20 of Mosquitto has been released. This is a bugfix release.
 
 Broker:
-- Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers". Closes [#3128].
-- Open files with appropriate access on Windows. Closes [#3119].
+- Fix QoS 1 / QoS 2 publish incorrectly returning "no subscribers".
+  Closes #3128.
+- Open files with appropriate access on Windows. Closes #3119.
+- Don't allow invalid response topic values.
+- Fix some strict protocol compliance issues. Closes #3052.
 
 Client library:
-- Fix cmake build on OS X. Closes [#3125].
+- Fix cmake build on OS X. Closes #3125.
 
-[#3119]: https://github.com/eclipse/mosquitto/issues/3119
-[#3125]: https://github.com/eclipse/mosquitto/issues/3125
+Build:
+- Fix build on NetBSD
+
+[#3052]: https://github.com/eclipse/mosquitto/issues/3128
+[#3119]: https://github.com/eclipse/mosquitto/issues/3128
+[#3125]: https://github.com/eclipse/mosquitto/issues/3128
 [#3128]: https://github.com/eclipse/mosquitto/issues/3128