diff --git a/mosquitto-2.0.16.tar.gz b/mosquitto-2.0.16.tar.gz
deleted file mode 100644
index 75abcb9d6b7b366c4b3b13814ed584cb78002159..0000000000000000000000000000000000000000
Binary files a/mosquitto-2.0.16.tar.gz and /dev/null differ
diff --git a/mosquitto-2.0.18.tar.gz b/mosquitto-2.0.18.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d5a7c074e6586bbe8b2ea26f69d253ddb3c3f301
Binary files /dev/null and b/mosquitto-2.0.18.tar.gz differ
diff --git a/mosquitto.spec b/mosquitto.spec
index 23f86d95ad5ac7d6b7f42faf3447f3af12ef0611..7b2494d1c5f4c7fa904126a9e50752922ce0d5f0 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,5 +1,5 @@
 Name:                mosquitto
-Version:             2.0.16
+Version:             2.0.18
 Release:             1
 Summary:             Open Source MQTT v3.1/v3.1.1 Broker
 License:             EPL-1.0
@@ -90,6 +90,14 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Fri Jul 05 2024 yaoxin <yao_xin001@hoperun.com> - 2.0.18-1
+- Update to 2.0.18
+  * Fix crash on subscribe under certain unlikely conditions.
+  * Fix mosquitto_rr not honouring `-R`.
+  * Fix `max_queued_messages 0` stopping clients from receiving messages.
+  * Fix `max_inflight_messages` not being set correctly.
+  * Fix `mosquitto_passwd -U` backup file creation.
+
 * Wed Sep 13 2023 yaoxin <yao_xin001@hoperun.com> - 2.0.16-1
 - Update to 2.0.16 for fix CVE-2021-34431,CVE-2023-28366 and CVE-2023-3592
 
@@ -111,7 +119,7 @@ exit 0
 * Thu Sep 30 2021 lingsheng <lingsheng@huawei.com> - 1.6.15-3
 - add usage output
 
-* Tue Sep 24 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-2
+* Fri Sep 24 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-2
 - add buildrequires make
 
 * Tue Sep 7 2021 zhengyaohui <zhengyaohui1@huawei.com> - 1.6.15-1