diff --git a/fix-usage-exit-code.patch b/fix-usage-exit-code.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2f0c8a6f92e286a453a23fd4835af6c1db5428b9
--- /dev/null
+++ b/fix-usage-exit-code.patch
@@ -0,0 +1,58 @@
+From 55ff763724f71e84ead9b0352506653dbb1c8d69 Mon Sep 17 00:00:00 2001
+From: lingsheng <lingsheng@huawei.com>
+Date: Thu, 30 Sep 2021 15:31:46 +0800
+Subject: [PATCH] fix usage exit code
+
+---
+ client/pub_client.c | 4 ++++
+ client/rr_client.c  | 3 +++
+ client/sub_client.c | 4 ++++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/client/pub_client.c b/client/pub_client.c
+index 59162a2..4ad2fb3 100644
+--- a/client/pub_client.c
++++ b/client/pub_client.c
+@@ -491,6 +491,10 @@ int main(int argc, char *argv[])
+ 		if(rc == 2){
+ 			/* --help */
+ 			print_usage();
++			mosquitto_lib_cleanup();
++			client_config_cleanup(&cfg);
++			pub_shared_cleanup();
++			return 0;
+ 		}else{
+ 			fprintf(stderr, "\nUse 'mosquitto_pub --help' to see usage.\n");
+ 		}
+diff --git a/client/rr_client.c b/client/rr_client.c
+index dec9468..180d3b8 100644
+--- a/client/rr_client.c
++++ b/client/rr_client.c
+@@ -267,6 +267,9 @@ int main(int argc, char *argv[])
+ 		if(rc == 2){
+ 			/* --help */
+ 			print_usage();
++			mosquitto_lib_cleanup();
++			client_config_cleanup(&cfg);
++			return 0;
+ 		}else{
+ 			fprintf(stderr, "\nUse 'mosquitto_rr --help' to see usage.\n");
+ 		}
+diff --git a/client/sub_client.c b/client/sub_client.c
+index fb26638..5f4ac5f 100644
+--- a/client/sub_client.c
++++ b/client/sub_client.c
+@@ -294,6 +294,10 @@ int main(int argc, char *argv[])
+ 		if(rc == 2){
+ 			/* --help */
+ 			print_usage();
++			mosquitto_destroy(mosq);
++			mosquitto_lib_cleanup();
++			client_config_cleanup(&cfg);
++			return 0;
+ 		}else{
+ 			fprintf(stderr, "\nUse 'mosquitto_sub --help' to see usage.\n");
+ 		}
+-- 
+2.23.0
+
diff --git a/mosquitto.spec b/mosquitto.spec
index 7981aaee8ee6514ae5d7a300c73999f6408ec26d..e9c19d8f49bda3173ecfcc5c9c50d4c32f133cf1 100644
--- a/mosquitto.spec
+++ b/mosquitto.spec
@@ -1,11 +1,12 @@
 Name:                mosquitto
 Version:             1.6.15
-Release:             3
+Release:             4
 Summary:             Open Source MQTT v3.1/v3.1.1 Broker
 License:             BSD
 URL:                 http://mosquitto.org/
 Source0:             http://mosquitto.org/files/source/%{name}-%{version}.tar.gz
 Patch0001:           add-usage-output.patch
+Patch0002:           fix-usage-exit-code.patch
 BuildRequires:       c-ares-devel gcc-c++ libuuid-devel libwebsockets-devel openssl-devel
 BuildRequires:       systemd-devel
 BuildRequires:       make
@@ -89,6 +90,9 @@ exit 0
 %{_mandir}/man3/*.3.*
 
 %changelog
+* Thu Sep 30 2021 lingsheng <lingsheng@huawei.com> - 1.6.15-4
+- fix usage exit code
+
 * Thu Sep 30 2021 lingsheng <lingsheng@huawei.com> - 1.6.15-3
 - add usage output