diff --git a/contrib/src/dhtnet/rules.mak b/contrib/src/dhtnet/rules.mak
index 75a3c42f5ea6c218b292c10e8ff35372bbc1dbaf..bd370e748ce5d982e56a4ca2df8f9ae3950af369 100644
--- a/contrib/src/dhtnet/rules.mak
+++ b/contrib/src/dhtnet/rules.mak
@@ -1,5 +1,5 @@
 # DHTNET
-DHTNET_VERSION := fd29c1d63cdd9768c6a850526d4e4b285ea50b12
+DHTNET_VERSION := cfe512b0632eea046f683b22e42d01eeb943d751
 DHTNET_URL := https://review.jami.net/plugins/gitiles/dhtnet/+archive/$(DHTNET_VERSION).tar.gz
 
 PKGS += dhtnet
diff --git a/contrib/src/natpmp/SHA512SUMS b/contrib/src/natpmp/SHA512SUMS
index f6bc1d2125988742b97538d1e27cbfee7b4daa74..de5e8c0ad2ee2e01ebe51d716fd4cdcf8e5ee917 100644
--- a/contrib/src/natpmp/SHA512SUMS
+++ b/contrib/src/natpmp/SHA512SUMS
@@ -1 +1,2 @@
 1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7  libnatpmp-20230423.tar.gz
+d277d7bd3a3cb47b18e8af2efc1e5c4e14e976dcd5732ff4741477da290a5e081a39ec1a482075700174c302601d54a641bc5cbe22eb7a4ee335ec0def359343  libnatpmp-007c3a53165a0551c877130eea4d966885ce19ae.tar.gz
diff --git a/contrib/src/natpmp/rules.mak b/contrib/src/natpmp/rules.mak
index 9ee1adbbe9e4fcf9d45bd8f74c1deea8fce8e433..c2f0914a40caeb76f977d586046c0fc37d72ab50 100644
--- a/contrib/src/natpmp/rules.mak
+++ b/contrib/src/natpmp/rules.mak
@@ -1,6 +1,6 @@
 # libnatpmp
-NATPMP_VERSION := 20230423
-NATPMP_URL := http://miniupnp.free.fr/files/download.php?file=libnatpmp-$(NATPMP_VERSION).tar.gz
+NATPMP_VERSION := 007c3a53165a0551c877130eea4d966885ce19ae
+NATPMP_URL := https://github.com/miniupnp/libnatpmp/archive/${NATPMP_VERSION}.tar.gz
 
 ifndef HAVE_WIN32
 ifndef HAVE_ANDROID
@@ -21,11 +21,10 @@ $(TARBALLS)/libnatpmp-$(NATPMP_VERSION).tar.gz:
 
 natpmp: libnatpmp-$(NATPMP_VERSION).tar.gz .sum-natpmp
 	$(UNPACK)
-	$(APPLY) $(SRC)/natpmp/0001-remove-shared-libs-executables.patch
 	$(MOVE)
 
-.natpmp: natpmp
-	cd $< && $(MAKE) INSTALLPREFIX="$(PREFIX)" $(HOSTVARS) install
-	-rm -f $(PREFIX)/lib/libnatpmp.so* $(PREFIX)/lib/libnatpmp.dylib*
+.natpmp: natpmp toolchain.cmake
+	cd $< && $(HOSTVARS) $(CMAKE) .
+	cd $< && $(MAKE) install
 	cd $< && cp natpmp_declspec.h $(PREFIX)/include/
 	touch $@