diff --git a/contrib/src/dhtnet/package.json b/contrib/src/dhtnet/package.json
index 74e9a971c42e7040611eca8654be176efb4e2893..a45b1ded538ff3b374b6ad6901244beaa09362fa 100644
--- a/contrib/src/dhtnet/package.json
+++ b/contrib/src/dhtnet/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dhtnet",
-    "version": "370257cdd858927172f4169acc8e873e8ae11f65",
+    "version": "c161aaa5e36cc2027ecdfb1c717d7131a669f7f5",
     "url": "https://review.jami.net/plugins/gitiles/dhtnet/+archive/__VERSION__.tar.gz",
     "deps": [
         "opendht",
diff --git a/contrib/src/dhtnet/rules.mak b/contrib/src/dhtnet/rules.mak
index 21e24261248304da6a151a4815ee3a84500c7120..bdfd613f3446f1b218d548567da68c8ed1f8809c 100644
--- a/contrib/src/dhtnet/rules.mak
+++ b/contrib/src/dhtnet/rules.mak
@@ -1,5 +1,5 @@
 # DHTNET
-DHTNET_VERSION := 370257cdd858927172f4169acc8e873e8ae11f65
+DHTNET_VERSION := c161aaa5e36cc2027ecdfb1c717d7131a669f7f5
 DHTNET_URL := https://review.jami.net/plugins/gitiles/dhtnet/+archive/$(DHTNET_VERSION).tar.gz
 
 PKGS += dhtnet
@@ -7,7 +7,8 @@ PKGS += dhtnet
 DEPS_dhtnet += opendht pjproject asio
 
 DHTNET_CONF = -DBUILD_SHARED_LIBS=Off \
-	-DBUILD_TESTING=Off
+	-DBUILD_TESTING=Off \
+	-DCMAKE_BUILD_TYPE=Debug
 
 $(TARBALLS)/dhtnet-$(DHTNET_VERSION).tar.gz:
 	$(call download,$(DHTNET_URL))
diff --git a/src/account.cpp b/src/account.cpp
index cce1c7d796a13780b1c2461f05c27315e94aed6f..eba6f664fee3e018f7f53fb5d938286dc57aad1f 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -101,7 +101,7 @@ Account::updateUpnpController()
 
     // UPNP enabled. Create new controller if needed.
     if (not upnpCtrl_) {
-        upnpCtrl_.reset(new dhtnet::upnp::Controller(Manager::instance().upnpContext()));
+        upnpCtrl_ = std::make_shared<dhtnet::upnp::Controller>(Manager::instance().upnpContext());
         if (not upnpCtrl_) {
             throw std::runtime_error("Failed to create a UPNP Controller instance!");
         }
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 38ddfa3fb8ee89462fc7ff62c106c36028ca7fad..8dfc9847786c8b93e4f3fa101ab8e3b2341c3f3b 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -116,7 +116,7 @@ SIPCall::SIPCall(const std::shared_ptr<SIPAccountBase>& account,
     jami_tracepoint(call_start, callId.c_str());
 
     if (account->getUPnPActive())
-        upnp_.reset(new dhtnet::upnp::Controller(Manager::instance().upnpContext()));
+        upnp_ = std::make_shared<dhtnet::upnp::Controller>(Manager::instance().upnpContext());
 
     setCallMediaLocal();