diff --git a/mosquitto-2.0.2.tar.gz b/mosquitto-2.0.2.tar.gz
deleted file mode 100644
index df0c3e2..0000000
--- a/mosquitto-2.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ea9ebf0a5ed3e95cecd75f30ebcf84f054584eff5617ac0f2e60428d3ad9707
-size 749529
diff --git a/mosquitto-2.0.2.tar.gz.sig b/mosquitto-2.0.2.tar.gz.sig
deleted file mode 100644
index 68a071a..0000000
--- a/mosquitto-2.0.2.tar.gz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl/SsdAACgkQd5si37Pn
-F7eDjRAAvJp4iZGlOSfsTD8EB4L2A7UQquzPYHfrqLSJPEzxJ3ReVCEnJQlYTg9V
-FgbJiPZ06XAJzr4jQ3WdBIy5XMnWXBVgMWHiQCnCwkfAUOSswHqvfJsHWNy5w6Fm
-ItBWSx07zkBBvJF39ijuke6kzf4NbFDH5UkuTsqpTTQ6mE+olNV32HrNoYkfvCpG
-6n2aqygALhi4plN+q5Bn0YpXSNOv38XhZGQ/KLS0+NBSRyr0w3TbJb2jr52qKdPe
-59ybfsBF4uKOH/4wz12irwzPJkYH7+jWfy11zli+yweecXC3TQBT/NaE7Gw1Xdw1
-oxlmEFCsE/Y5qqIQw5aVSks/DIKKpqiKyNydg4thUcsTCPPCNjQu3eC9e9/cY3l9
-oYkMNib6LDyVesmOhSN/KbCyVsLV57ZIXmERx12B/pL0+s04HFgx1fM9/dNhZHnN
-tnKu3r2+MT4sXl8U/gQKSdUJgi6WTxqOKw89t+PsECuP/OdaCGQucyUMM0BNyudk
-xw94rfgLed6PbSRxShy7XN1QqfUQ0EfktxFkHlis+c7g17OIadi39CzMw/VT36T2
-V4TQq6RKWL39DfJeUQX4aYT7BnceRgNGD4OW+Ky8qh7b8zVxkKFv2IsXZwmoUevR
-d1o8p4fMir1pB2sZri2aqlkniZYwJTb7jF9DE+rcMIwDWp+XPb0=
-=xC3R
------END PGP SIGNATURE-----
diff --git a/mosquitto-2.0.4.tar.gz b/mosquitto-2.0.4.tar.gz
new file mode 100644
index 0000000..63875c7
--- /dev/null
+++ b/mosquitto-2.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba3126d82533fe40a18cf1a989e61eaea887e81829cd93518149e73553d20f10
+size 751539
diff --git a/mosquitto-2.0.4.tar.gz.sig b/mosquitto-2.0.4.tar.gz.sig
new file mode 100644
index 0000000..63ee9b5
--- /dev/null
+++ b/mosquitto-2.0.4.tar.gz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEoNbuodyuSaY1o7Lwd5si37PnF7cFAl/iJX8ACgkQd5si37Pn
+F7d4PRAAzhH7prRiWmdD7ey1MkQGQ5sMqb1W70uKAzKP3+2A8WPyUR0BbFkY25eB
+cV1008rZaHVRmCH2/6hGK7kfGvReJPs4pQC8Hbb8Gh8mx32DKrKWmMYY4Vy25sa9
+KXgx4Bb0pMCZI61IlXqNKfNzHbj0AMs6x42EawAurjEAaw88TnjGp2tq0qims6jJ
+LGXu3OsrGvjfqE84MOhQ3eyRffdkgvakPPubIymnuFv8VSA2W409Ce2ms54Iqsdc
+Ngty42M02HvV5/Z1/+ZT1C/tgMvHHaUkknzK09NhW3+XAkbFsRI6muFwDUrPGNCd
+6gL2KUixs3aacDaN4O4bRg8CPq9X3PA5Y8uAm4fh3PPpk1vA2Amv3mv/Rlpn8rYa
+JqnTYcIXvdNWU3OWgmgCc8LJhjOG5o2CeK3GmRaMevZrnLqGXgYjY+5cAx5E4Mph
+Ln3P8mWpJH67MaiEuI0envfYodwnWJBTVTVCj7uQALnOvtCSZUlnSvQFMp3oRR6K
+Wk8iWXvrM4eCfOM5EYPziqbIOwWYY5XH+RnoxYw9dGNUwbJAm3q7WFxEnezTdGNo
+NIjsKtFprAfXZ7xjahsi0x/mAe/iKm5s6F7VPzZoczjo68vSKVaBkCkmB5EJdREP
+iZpXBOsEVkkFs4HUc9erjs/K+4cW/ShTE/DnecRSyzy/7Gtq9DQ=
+=SaB8
+-----END PGP SIGNATURE-----
diff --git a/mosquitto.changes b/mosquitto.changes
index 9890b33..f00eb5e 100644
--- a/mosquitto.changes
+++ b/mosquitto.changes
@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Wed Dec 23 17:12:17 UTC 2020 - Martin Hauke <mardnh@gmx.de>
+
+- Update to version 2.0.4
+  Broker:
+  * Fix $SYS/broker/publish/messages/+ counters not being updated
+    for QoS 1, 2 messages.
+  * mosquitto_connect_bind_async() and mosquitto_connect_bind_v5()
+    should not reset the bind address option if called with
+    bind_address == NULL.
+  * Add more log messages for dynsec load/save error conditions.
+  Build:
+  * Fix man pages not being built when using CMake.
+- Update to version 2.0.3
+  Security:
+  * Running mosquitto_passwd with the following arguments only
+    `mosquitto_passwd -b password_file username password` would
+    cause the username to be used as the password.
+  Broker:
+  * Fix LWT not being sent on client takeover when the existing
+    session wasn't being continued.
+  * Fix bridges possibly not completing connections when WITH_ADNS
+    is in use.
+  * Fix QoS 0 messages not being delivered if max_queued_messages
+    was set to 0.
+  * Fix local bridges being disconnected on SIGHUP.
+  * Fix slow initial bridge connections for WITH_ADNS=no.
+  * Fix persistence_location not appending a '/'.
+  Clients:
+  * Fix mosquitto_sub being unable to terminate with Ctrl-C if a
+    successful connection is not made.
+  Apps:
+  * Fix `mosquitto_passwd -b` using username as password (not if
+    `-c` is also used).
+  Build:
+  * Fix `install` target when using WITH_CJSON=no.
+
 -------------------------------------------------------------------
 Sat Dec 12 22:03:09 UTC 2020 - Martin Hauke <mardnh@gmx.de>
 
diff --git a/mosquitto.spec b/mosquitto.spec
index aabdc37..3aa3d26 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -20,7 +20,7 @@
 %define c_lib   libmosquitto1
 %define cpp_lib libmosquittopp1
 Name:           mosquitto
-Version:        2.0.2
+Version:        2.0.4
 Release:        0
 Summary:        A MQTT v3.1/v3.1.1 Broker
 License:        EPL-1.0