diff --git a/0001-Do-not-include-glx.h-when-using-GLES.patch b/0001-Do-not-include-glx.h-when-using-GLES.patch
new file mode 100644
index 0000000..7ffe466
--- /dev/null
+++ b/0001-Do-not-include-glx.h-when-using-GLES.patch
@@ -0,0 +1,31 @@
+From 9be7aaacd55b6264f8b893277f3f44c1f2b37c47 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Sat, 15 Jul 2017 21:14:07 +0200
+Subject: [PATCH] Do not include glx.h when using GLES
+
+---
+ modules/highgui/src/window_QT.cpp | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
+index 4cfce66..baea0a2 100644
+--- a/modules/highgui/src/window_QT.cpp
++++ b/modules/highgui/src/window_QT.cpp
+@@ -54,9 +54,12 @@
+ #include <unistd.h>
+ #endif
+ 
++// Get GL_PERSPECTIVE_CORRECTION_HINT definition, not available in GLES 2 or
++// OpenGL 3 core profile or later
+ #ifdef HAVE_QT_OPENGL
+-    #if defined Q_WS_X11 /* Qt4 */ || defined Q_OS_LINUX /* Qt5 */
+-        #include <GL/glx.h>
++    #if defined Q_WS_X11 /* Qt4 */ || \
++        (!defined(QT_OPENGL_ES_2) && defined Q_OS_LINUX) /* Qt5 with desktop OpenGL */
++        #include <GL/gl.h>
+     #endif
+ #endif
+ 
+-- 
+2.13.2
+
diff --git a/opencv.changes b/opencv.changes
index f6b6122..e612ff9 100644
--- a/opencv.changes
+++ b/opencv.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Jul 15 19:14:48 UTC 2017 - stefan.bruens@rwth-aachen.de
+
+- Add 0001-Do-not-include-glx.h-when-using-GLES.patch
+  Fix build for 32bit ARM, including both GLES and desktop GL headers
+  causes incompatible pointer type errors
+
 -------------------------------------------------------------------
 Mon Jun  5 12:15:24 UTC 2017 - tchvatal@suse.com
 
diff --git a/opencv.spec b/opencv.spec
index d48fa1a..9cd0bae 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -38,6 +38,8 @@ Patch1:         opencv-gles.patch
 Patch8:         opencv-build-compare.patch
 # PATCH-FIX-UPSTREAM opencv-gcc6-fix-pch-support-PR8345.patch -- fix PCH support on GCC 6.x
 Patch10:        opencv-gcc6-fix-pch-support-PR8345.patch
+# PATCH-FIX-OPENSUSE 0001-Do-not-include-glx.h-when-using-GLES.patch -- Fix build error on 32bit ARM, due to incompatible pointer types
+Patch11:        0001-Do-not-include-glx.h-when-using-GLES.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  libeigen3-devel