diff --git a/net-tools-1.60-fix-header-conflict.patch b/net-tools-1.60-fix-header-conflict.patch
new file mode 100644
index 0000000..727e3a1
--- /dev/null
+++ b/net-tools-1.60-fix-header-conflict.patch
@@ -0,0 +1,13 @@
+Index: net-tools-1.60/iptunnel.c
+===================================================================
+--- net-tools-1.60.orig/iptunnel.c
++++ net-tools-1.60/iptunnel.c
+@@ -26,7 +26,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <netinet/ip.h>
++#include <linux/ip.h>
+ #include <arpa/inet.h>
+ #if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
+ #include <net/if.h>
diff --git a/net-tools.changes b/net-tools.changes
index 5825144..b73dd9f 100644
--- a/net-tools.changes
+++ b/net-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 17 07:39:12 UTC 2016 - schwab@suse.de
+
+- net-tools-1.60-fix-header-conflict.patch: use kernel headers to avoid
+  conflict with user-space headers
+
 -------------------------------------------------------------------
 Tue May 17 11:36:17 UTC 2016 - pwieczorkiewicz@suse.com
 
diff --git a/net-tools.spec b/net-tools.spec
index b5cba12..19d5519 100644
--- a/net-tools.spec
+++ b/net-tools.spec
@@ -85,6 +85,7 @@ Patch51:        net-tools-1.60-plipconfig-manpage.patch
 Patch52:        net-tools-1.60-plipconfig-ecode.patch
 # PATCH-FIX-UPSTREAM net-tools-1.60-hostname-s.patch boo#872264 ticket#14 commit#452f8e 
 Patch53:        net-tools-1.60-hostname-s.patch
+Patch54:        net-tools-1.60-fix-header-conflict.patch
 
 %description
 This package contains essential programs for network administration and
@@ -164,6 +165,7 @@ cp %{S:3} lib/
 %patch51 -p1
 %patch52 -p1
 %patch53 -p1
+%patch54 -p1
 cp %{S:4} .
 cp %{S:5} ./man/en_US