diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile
index f4ac111f79a568..458ddaf203c677 100644
--- a/net/mosquitto/Makefile
+++ b/net/mosquitto/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
 PKG_VERSION:=1.5.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 PKG_CPE_ID:=cpe:/a:eclipse:mosquitto
@@ -20,6 +20,7 @@ PKG_SOURCE_URL:=https://mosquitto.org/files/source/
 PKG_HASH:=fcdb47e340864c545146681af7253399cc292e41775afd76400fda5b0d23d668
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mosquitto/default
@@ -146,7 +147,7 @@ endef
 define Package/libmosquittopp
     SECTION:=libs
     CATEGORY:=Libraries
-    DEPENDS:=libmosquitto +libstdcpp
+    DEPENDS:=libmosquitto $(CXX_DEPENDS)
     TITLE:= mosquitto - client c++ library
 endef
 
diff --git a/net/mosquitto/patches/010-openssl-deprecated.patch b/net/mosquitto/patches/010-openssl-deprecated.patch
new file mode 100644
index 00000000000000..43695a12bf7153
--- /dev/null
+++ b/net/mosquitto/patches/010-openssl-deprecated.patch
@@ -0,0 +1,46 @@
+--- a/lib/net_mosq.c
++++ b/lib/net_mosq.c
+@@ -87,9 +87,11 @@ int net__init(void)
+ #endif
+ 
+ #ifdef WITH_TLS
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSL_library_init();
+ 	OpenSSL_add_all_algorithms();
++#endif
+ 	if(tls_ex_index_mosq == -1){
+ 		tls_ex_index_mosq = SSL_get_ex_new_index(0, "client context", NULL, NULL, NULL);
+ 	}
+@@ -102,14 +104,14 @@ void net__cleanup(void)
+ #ifdef WITH_TLS
+ 	#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 		ERR_remove_state(0);
+-	#endif
+ 	#ifndef OPENSSL_NO_ENGINE
+ 		ENGINE_cleanup();
+ 	#endif
+-	CONF_modules_unload(1);
+-	ERR_free_strings();
+-	EVP_cleanup();
+-	CRYPTO_cleanup_all_ex_data();
++		CONF_modules_unload(1);
++		ERR_free_strings();
++		EVP_cleanup();
++		CRYPTO_cleanup_all_ex_data();
++	#endif
+ #endif
+ 
+ #ifdef WITH_SRV
+--- a/src/mosquitto_passwd.c
++++ b/src/mosquitto_passwd.c
+@@ -387,7 +387,9 @@ int main(int argc, char *argv[])
+ 	signal(SIGINT, handle_sigint);
+ 	signal(SIGTERM, handle_sigint);
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	OpenSSL_add_all_digests();
++#endif
+ 
+ 	if(argc == 1){
+ 		print_usage();