diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 6d6c767..8839f8a 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
+
+- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch 
+  * bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch
+    (boo#1082297)
+
 -------------------------------------------------------------------
 Mon Feb 19 23:24:22 UTC 2018 - schwab@suse.de
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index f041d3f..472c564 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -140,8 +140,6 @@ Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 # never to be upstreamed
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
-# never to be upstreamed
-Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
@@ -473,8 +471,8 @@ applications using the OpenGL|ES 3.x APIs.
 
 %package -n libOSMesa8
 Summary:        Mesa Off-screen rendering extension
-Group:          System/Libraries
 # Wrongly named package shipped .so.8
+Group:          System/Libraries
 Obsoletes:      libOSMesa9 < %{version}
 Provides:       libOSMesa9 = %{version}
 
@@ -608,8 +606,8 @@ implementation of Mesa.
 
 %package -n Mesa-libd3d
 Summary:        Mesa Direct3D9 state tracker
-Group:          System/Libraries
 # Manually provide d3d library (bnc#918294)
+Group:          System/Libraries
 %ifarch x86_64 s390x ppc64le aarch64 riscv64
 Provides:       d3dadapter9.so.1()(64bit)
 %else
@@ -760,7 +758,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch13 -p1
 %patch12 -p1
 %patch18 -p1
-%patch21 -p1
 
 %if 0%{?libglvnd}
 %patch31 -p1
diff --git a/Mesa.changes b/Mesa.changes
index 6d6c767..8839f8a 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 23 10:51:04 UTC 2018 - sndirsch@suse.com
+
+- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch 
+  * bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch
+    (boo#1082297)
+
 -------------------------------------------------------------------
 Mon Feb 19 23:24:22 UTC 2018 - schwab@suse.de
 
diff --git a/Mesa.spec b/Mesa.spec
index 4d9a5df..31b0c99 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -139,8 +139,6 @@ Patch13:        u_mesa-8.0.1-fix-16bpp.patch
 Patch15:        u_mesa-8.0-llvmpipe-shmget.patch
 # never to be upstreamed
 Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
-# never to be upstreamed
-Patch21:        n_Define-GLAPIVAR-separate-from-GLAPI.patch
 # currently needed for libglvnd support
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 Patch32:        archlinux_glvnd-fix-gl-dot-pc.patch
@@ -472,8 +470,8 @@ applications using the OpenGL|ES 3.x APIs.
 
 %package -n libOSMesa8
 Summary:        Mesa Off-screen rendering extension
-Group:          System/Libraries
 # Wrongly named package shipped .so.8
+Group:          System/Libraries
 Obsoletes:      libOSMesa9 < %{version}
 Provides:       libOSMesa9 = %{version}
 
@@ -607,8 +605,8 @@ implementation of Mesa.
 
 %package -n Mesa-libd3d
 Summary:        Mesa Direct3D9 state tracker
-Group:          System/Libraries
 # Manually provide d3d library (bnc#918294)
+Group:          System/Libraries
 %ifarch x86_64 s390x ppc64le aarch64 riscv64
 Provides:       d3dadapter9.so.1()(64bit)
 %else
@@ -759,7 +757,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 #%patch13 -p1
 %patch12 -p1
 %patch18 -p1
-%patch21 -p1
 
 %if 0%{?libglvnd}
 %patch31 -p1
diff --git a/n_Define-GLAPIVAR-separate-from-GLAPI.patch b/n_Define-GLAPIVAR-separate-from-GLAPI.patch
deleted file mode 100644
index aadf0e8..0000000
--- a/n_Define-GLAPIVAR-separate-from-GLAPI.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Egbert Eich <eich@suse.de>
-Date: Fri Mar 11 13:29:43 2016 +0100
-Subject: [PATCH]Define GLAPIVAR separate from GLAPI
-Patch-mainline: never
-Git-commit: 88dda160564c8c23cb533b0eb258404f1687a2e8
-
-References: bsc#
-Signed-off-by: Egbert Eich <eich@suse.com>
-
-GLAPI doesn't contain 'extern' in some environments.
-This is needed for variables (GLw).
-
-Signed-off-by: Egbert Eich <eich@suse.de>
----
- Mesa-10.0.3/include/GL/gl.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/include/GL/gl.h b/Mesa-10.0.3/include/GL/gl.h
-index b484b96..5189008 100644
---- a/include/GL/gl.h
-+++ b/include/GL/gl.h
-@@ -59,6 +59,7 @@
- #elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
- #  define GLAPI __attribute__((visibility("default")))
- #  define GLAPIENTRY
-+#  define GLAPIVAR extern GLAPI
- #endif /* WIN32 && !CYGWIN */
- 
- /*
-@@ -80,6 +81,10 @@
- #define GLAPI extern
- #endif
- 
-+#ifndef GLAPIVAR
-+#define GLAPIVAR extern
-+#endif
-+
- #ifndef GLAPIENTRY
- #define GLAPIENTRY
- #endif