diff --git a/contrib/src/pjproject/rules.mak b/contrib/src/pjproject/rules.mak
index 10c6a311512d320dc0e9bdb096795cd6ff140f34..efc7be5a78b13f68bbf7f7d1aac7d54fb2c8ab9c 100644
--- a/contrib/src/pjproject/rules.mak
+++ b/contrib/src/pjproject/rules.mak
@@ -29,6 +29,10 @@ endif
 
 PJPROJECT_EXTRA_CFLAGS = -DPJ_ICE_MAX_CAND=32 -DPJ_ICE_MAX_CHECKS=150 -DPJ_ICE_COMP_BITS=2
 
+ifdef HAVE_WIN64
+PJPROJECT_EXTRA_CFLAGS += -DPJ_WIN64=1
+endif
+
 PKGS += pjproject
 # FIXME: nominally 2.2.0 is enough, but it has to be patched for gnutls
 ifeq ($(call need_pkg,'libpjproject'),)
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index 378a4f975c26e5c4e0aeca95ee5ed45391f00830..184569f9f05986523f5d5e83fc5af1830d2d3d4c 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -18,6 +18,9 @@ ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/upnp/libupnp-win32.patch
 	$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 	$(APPLY) $(SRC)/upnp/threadpool.patch
+endif
+ifdef HAVE_WIN64
+	$(APPLY) $(SRC)/upnp/win_inet_pton.patch
 endif
 	$(APPLY) $(SRC)/upnp/libupnp-ipv6.patch
 	$(APPLY) $(SRC)/upnp/miniserver.patch
diff --git a/contrib/src/upnp/win_inet_pton.patch b/contrib/src/upnp/win_inet_pton.patch
new file mode 100644
index 0000000000000000000000000000000000000000..22e0f550daf9dc7aeeb5154cacc33a0293bb53b1
--- /dev/null
+++ b/contrib/src/upnp/win_inet_pton.patch
@@ -0,0 +1,25 @@
+--- a/upnp/src/inet_pton.c	2013-11-15 11:10:05.000000000 -0500
++++ b/upnp/src/inet_pton.c	2016-02-16 13:21:03.963801774 -0500
+@@ -304,20 +304,7 @@
+ 	/* NOTREACHED */
+ }
+
+-int inet_pton(int af, const char *src, void *dst)
+-{
+-	switch (af) {
+-	case AF_INET:
+-		return inet_pton4(src, dst);
+-#ifdef INET_IPV6
+-	case AF_INET6:
+-		return inet_pton6(src, dst);
+-#endif
+-	default:
+-		/*__set_errno(EAFNOSUPPORT);*/
+-		return -1;
+-	}
+-	/* NOTREACHED */
+-}
++#define InetPtonA inet_pton
++WINSOCK_API_LINKAGE INT WSAAPI InetPtonA(INT Family, LPCSTR pStringBuf, PVOID pAddr);
+
+ #endif /* WIN32 */