diff --git a/linux-glibc-devel-if_pppox-includes.patch b/linux-glibc-devel-if_pppox-includes.patch
new file mode 100644
index 0000000..308c4e7
--- /dev/null
+++ b/linux-glibc-devel-if_pppox-includes.patch
@@ -0,0 +1,21 @@
+Fixes userspace compilation error:
+
+error: "IFNAMSIZ" undeclared here (not in a function)
+
+Signed-off-by: Mikko Rapeli <mikko.rapeli [at] iki>
+---
+include/uapi/linux/if_pppox.h | 1 +
+1 file changed, 1 insertion(+)
+
+Index: linux-glibc-devel-4.1/usr/include/linux/if_pppox.h
+===================================================================
+--- linux-glibc-devel-4.1.orig/usr/include/linux/if_pppox.h
++++ linux-glibc-devel-4.1/usr/include/linux/if_pppox.h
+@@ -21,6 +21,7 @@
+ #include <asm/byteorder.h>
+ 
+ #include <linux/socket.h>
++#include <linux/if.h>
+ #include <linux/if_ether.h>
+ #include <linux/if_pppol2tp.h>
+ 
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index a5d7339..e05d0d6 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul 29 10:44:36 UTC 2015 - dimstar@opensuse.org
+
+- Add linux-glibc-devel-if_pppox-includes.patch: fix compilation of
+  userspace programs including if_pppox.h (e.g. ebtables).
+
 -------------------------------------------------------------------
 Fri Jul  3 18:19:17 UTC 2015 - crrodriguez@opensuse.org
 
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index 6e23672..bb52755 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -37,6 +37,8 @@ Obsoletes:      linux-kernel-headers < %{version}
 PreReq:         coreutils
 Source:         %{name}-%{upstream_version}.tar.xz
 Source1:        install_all.sh
+# PATCH-FIX-UPSTREAM linux-glibc-devel-if_pppox-includes.patch dimstar@opensuse.org -- Fixes userspace compilation error
+Patch0:         linux-glibc-devel-if_pppox-includes.patch
 
 %description
 This package provides Linux kernel headers, the kernel API description
@@ -49,6 +51,7 @@ packages, instead.
 
 %prep
 %setup -q -n linux-glibc-devel-%{upstream_version}
+%patch0 -p1
 
 %build
 cat > version.h <<-BOGUS