diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 69355864..8087d621 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -490,6 +490,7 @@ patch_enable_all ()
 	enable_ws2_32_WSACleanup="$1"
 	enable_ws2_32_WriteWatches="$1"
 	enable_ws2_32_getsockopt="$1"
+	enable_ws2_32_if_nameindex="$1"
 	enable_wtsapi32_EnumerateProcesses="$1"
 	enable_wtsapi32_WTSQueryUserToken="$1"
 	enable_wuauserv_Dummy_Service="$1"
@@ -1727,6 +1728,9 @@ patch_enable ()
 		ws2_32-getsockopt)
 			enable_ws2_32_getsockopt="$2"
 			;;
+		ws2_32-if_nameindex)
+			enable_ws2_32_if_nameindex="$2"
+			;;
 		wtsapi32-EnumerateProcesses)
 			enable_wtsapi32_EnumerateProcesses="$2"
 			;;
@@ -10007,6 +10011,18 @@ if test "$enable_ws2_32_getsockopt" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset ws2_32-if_nameindex
+# |
+# | Modified files:
+# |   *	configure.ac
+# |
+if test "$enable_ws2_32_if_nameindex" -eq 1; then
+	patch_apply ws2_32-if_nameindex/0001-configure.ac-Improve-check-for-if_nameindex.patch
+	(
+		printf '%s\n' '+    { "Sebastian Lackner", "configure.ac: Improve check for if_nameindex.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset wtsapi32-EnumerateProcesses
 # |
 # | This patchset fixes the following Wine bugs:
diff --git a/patches/ws2_32-if_nameindex/0001-configure.ac-Improve-check-for-if_nameindex.patch b/patches/ws2_32-if_nameindex/0001-configure.ac-Improve-check-for-if_nameindex.patch
new file mode 100644
index 00000000..ab6a7de0
--- /dev/null
+++ b/patches/ws2_32-if_nameindex/0001-configure.ac-Improve-check-for-if_nameindex.patch
@@ -0,0 +1,26 @@
+From e003cc0c093e2d382cf19b8b322e30abf105ab0f Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Mon, 17 Jul 2017 22:08:46 +0200
+Subject: configure.ac: Improve check for if_nameindex.
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 7270ce78525..ea427113249 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2343,6 +2343,9 @@ AC_CACHE_CHECK([for if_nameindex],wine_cv_have_if_nameindex,
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_SOCKET_H
++#include <sys/socket.h>
++#endif
+ #ifdef HAVE_NET_IF_H
+ # include <net/if.h>
+ #endif]],
+-- 
+2.13.1
+