diff --git a/piglit.changes b/piglit.changes
index 3718480..d216370 100644
--- a/piglit.changes
+++ b/piglit.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 27 11:54:22 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Fix SOURCE5 installation
+- Handle properly openGL and openGL ES tests
+- Enable Build for %arm and AArch64
+
 -------------------------------------------------------------------
 Thu Jun 08 17:58:40 UTC 2017 - mimi.vx@gmail.com
 
diff --git a/piglit.spec b/piglit.spec
index 79c8750..fda4262 100644
--- a/piglit.spec
+++ b/piglit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package piglit
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -16,6 +16,16 @@
 #
 
 
+%ifarch %arm aarch64
+# Enable openGL ES only
+%bcond_with opengl
+%bcond_without opengles
+%else
+# Enable openGL and openGL ES
+%bcond_without opengl
+%bcond_without opengles
+%endif
+
 Name:           piglit
 Version:        1~20170607.bc6ef16df
 Release:        0
@@ -41,11 +51,20 @@ BuildRequires:  python3-six
 BuildRequires:  python3-xml
 BuildRequires:  waffle-devel
 BuildRequires:  pkgconfig(egl)
+%if %{with opengl}
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(glu)
+%endif
+%if %{with opengles}
+BuildRequires:  Mesa-libGLESv3-devel
+BuildRequires:  pkgconfig(glesv1_cm)
+BuildRequires:  pkgconfig(glesv2)
+%endif
 BuildRequires:  pkgconfig(libdrm)
+%ifarch x86_64
 BuildRequires:  pkgconfig(libdrm_intel)
+%endif
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
@@ -56,7 +75,7 @@ Requires:       python3-Mako
 Requires:       python3-numpy
 Requires:       python3-six
 Requires:       python3-xml
-ExcludeArch:    %{ix86} %{arm} ppc
+ExcludeArch:    %{ix86} ppc
 
 %description
 Piglit is a collection of automated tests for OpenGL and OpenCL
@@ -83,6 +102,14 @@ be generated, including the ability to compare different test runs.
 # CMAKE_BUILD_WITH_INSTALL_RPATH so the individual test binaries in
 # /usr/lib64/piglit/bin/* can find the libraries in /usr/lib64/piglit/lib
 %cmake \
+%if %{without opengl}
+  -DPIGLIT_BUILD_GL_TESTS=OFF \
+%endif
+%if %{without opengles}
+  -DPIGLIT_BUILD_GL_ES1_TESTS=OFF \
+  -DPIGLIT_BUILD_GL_ES2_TESTS=OFF \
+  -DPIGLIT_BUILD_GL_ES3_TESTS=OFF \
+%endif
   -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
   -DCMAKE_SKIP_RPATH:BOOL=OFF \
   -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
@@ -94,7 +121,7 @@ make %{?_smp_mflags}
 install -D -m 644 %{SOURCE2} %{buildroot}%{_libdir}/piglit/tests
 install -D -m 644 %{SOURCE3} %{buildroot}%{_libdir}/piglit/tests
 install -D -m 644 %{SOURCE4} %{buildroot}%{_libdir}/piglit/tests
-install -D -m 644 %{SOURCE4} %{buildroot}%{_libdir}/piglit/tests
+install -D -m 644 %{SOURCE5} %{buildroot}%{_libdir}/piglit/tests
 %fdupes %{buildroot}/%{_libdir}/piglit
 
 %post -p /sbin/ldconfig