diff --git a/fix-header-conflict.patch b/fix-header-conflict.patch
new file mode 100644
index 0000000..19c109b
--- /dev/null
+++ b/fix-header-conflict.patch
@@ -0,0 +1,13 @@
+Index: ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c
++++ ppp-2.4.7/pppd/plugins/rp-pppoe/plugin.c
+@@ -49,6 +49,8 @@ static char const RCSID[] =
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
+ #include <linux/ppp_defs.h>
++#define _LINUX_IN_H /* block <linux/in.h> from being included */
++#define _LINUX_IN6_H /* block <linux/in6.h> from being included */
+ #include <linux/if_pppox.h>
+ 
+ #ifndef _ROOT_PATH
diff --git a/ppp.changes b/ppp.changes
index d5ce16e..d8e76fa 100644
--- a/ppp.changes
+++ b/ppp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 17 10:26:16 UTC 2016 - schwab@suse.de
+
+- fix-header-conflict.patch: avoid conflict with kernel headers
+
 -------------------------------------------------------------------
 Fri Nov 13 15:26:03 UTC 2015 - max@suse.com
 
diff --git a/ppp.spec b/ppp.spec
index 222b779..d13ac5e 100644
--- a/ppp.spec
+++ b/ppp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ppp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -71,6 +71,7 @@ Patch22:        ppp-2.4.4-var_run_resolv_conf.patch
 Patch23:        ppp-send-padt.patch
 # PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
 Patch24:        ppp-CVE-2015-3310.patch
+Patch25:        fix-header-conflict.patch
 
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon,
@@ -112,6 +113,7 @@ plugins for the pppd.
 %patch22
 %patch23 -p1
 %patch24
+%patch25 -p1
 sed -i -e '1s/local\///' scripts/secure-card
 find scripts -type f | xargs chmod a-x
 find -type f -name '*.orig' | xargs rm -f