diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib
index 4c60341..ec356d7 100644
Binary files a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib and b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.lib differ
diff --git a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb
index 9faeb01..db4ad28 100644
Binary files a/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb and b/external/lib/libzmq/Debug/libzmq-v142-mt-sgd-4_3_6.pdb differ
diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib
index 49f4d77..15de183 100644
Binary files a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib and b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.lib differ
diff --git a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb
index 907b8e7..c58a97c 100644
Binary files a/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb and b/external/lib/libzmq/Release/libzmq-v142-mt-s-4_3_6.pdb differ
diff --git a/external/src/libzmq b/external/src/libzmq
index 3b26401..c2fae81 160000
--- a/external/src/libzmq
+++ b/external/src/libzmq
@@ -1 +1 @@
-Subproject commit 3b264019a24b08246e8a75f5014f893d7b6ffef9
+Subproject commit c2fae81460d9d39a896da7b3f72484d23a172fa7
diff --git a/external/src/miniupnp b/external/src/miniupnp
index 3199520..7282a75 160000
--- a/external/src/miniupnp
+++ b/external/src/miniupnp
@@ -1 +1 @@
-Subproject commit 31995208c9ec40cc89d97ce492481aaf86cfd2e3
+Subproject commit 7282a75841acd63d83bb30abd43fd40cfa46f023
diff --git a/external/src/rapidjson b/external/src/rapidjson
index 128cc93..5eb4b23 160000
--- a/external/src/rapidjson
+++ b/external/src/rapidjson
@@ -1 +1 @@
-Subproject commit 128cc9359fb3c2128928fe18cb833008d918d143
+Subproject commit 5eb4b2335a3f849c8b421b75354f98a1169fed95
diff --git a/src/util.cpp b/src/util.cpp
index 5a191ff..3b460a7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -740,23 +740,15 @@ int add_portmapping(int external_port, int internal_port)
 	UPNPUrls urls;
 	IGDdatas data;
 	char local_addr[64] = {};
+	char wan_addr[64] = {};
 
-	int result = UPNP_GetValidIGD(upnp_discover.devlist, &urls, &data, local_addr, sizeof(local_addr));
+	int result = UPNP_GetValidIGD(upnp_discover.devlist, &urls, &data, local_addr, sizeof(local_addr), wan_addr, sizeof(wan_addr));
 	if (result != 1) {
 		LOGWARN(1, "UPNP_GetValidIGD returned " << result << ", no valid UPnP IGD devices found");
 		return 0;
 	}
 
-	LOGINFO(1, "UPnP: LAN IP address " << log::Gray() << static_cast<const char*>(local_addr));
-
-	char ext_addr[64] = {};
-	result = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, ext_addr);
-	if ((result != UPNPCOMMAND_SUCCESS) || !ext_addr[0]) {
-		LOGWARN(1, "UPNP_GetExternalIPAddress: failed to query external IP address, error " << result);
-	}
-	else {
-		LOGINFO(1, "UPnP: WAN IP address " << log::Gray() << static_cast<const char*>(ext_addr));
-	}
+	LOGINFO(1, "UPnP: LAN IP address " << log::Gray() << static_cast<const char*>(local_addr) << log::NoColor() << ", WAN IP address " << log::Gray() << static_cast<const char*>(wan_addr));
 
 	char eport[16] = {};
 	do { log::Stream s(eport); s << external_port; } while (0);
@@ -786,7 +778,7 @@ int add_portmapping(int external_port, int internal_port)
 		return 0;
 	}
 
-	LOGINFO(1, "UPnP: Mapped " << log::Gray() << static_cast<const char*>(ext_addr) << ':' << external_port << log::NoColor() << " to " << log::Gray() << static_cast<const char*>(local_addr) << ':' << internal_port);
+	LOGINFO(1, "UPnP: Mapped " << log::Gray() << static_cast<const char*>(wan_addr) << ':' << external_port << log::NoColor() << " to " << log::Gray() << static_cast<const char*>(local_addr) << ':' << internal_port);
 	return external_port;
 }
 
@@ -805,7 +797,7 @@ void remove_portmapping(int external_port)
 	IGDdatas data;
 	char local_addr[64] = {};
 
-	int result = UPNP_GetValidIGD(upnp_discover.devlist, &urls, &data, local_addr, sizeof(local_addr));
+	int result = UPNP_GetValidIGD(upnp_discover.devlist, &urls, &data, local_addr, sizeof(local_addr), nullptr, 0);
 	if (result != 1) {
 		LOGWARN(1, "UPNP_GetValidIGD returned " << result << ", no valid UPnP IGD devices found");
 		return;