diff --git a/.gitignore b/.gitignore
index ec358c8..33a8bb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /glmark2-2014.03.tar.gz
+/glmark2-0003eff.tar.gz
diff --git a/glmark2.spec b/glmark2.spec
index d4e55c9..4dd1b1a 100644
--- a/glmark2.spec
+++ b/glmark2.spec
@@ -1,33 +1,16 @@
+%global commit0 0003eff782938daf852a70f6ca4cdf8fafd02854
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global commitdate0 20180717
+
 Name:		glmark2
-Version:	2014.03
-Release:	11%{?dist}
+Version:	2017.07
+Release:	1.%{commitdate0}git%{shortcommit0}%{?dist}
 Summary:	Benchmark for OpenGL 2.0
 
 
 License:	GPLv3
-URL:		http://launchpad.net/glmark2
-# the project is moving to github, in the future the upstream will point here:
-#URL:		https://github.com/glmark2/glmark2
-
-
-
-##
-## upstream sources
-##
-
-## Instructions for creating (future) github tarball:
-#
-# git clone https://github.com/glmark2/glmark2.git
-# cd glmark2
-# githash=$(git rev-parse --short HEAD)
-# gitdate=$(date --utc +%Y%m%d)
-# git archive --prefix="glmark2-${gitdate}git${githash}/" ${githash} | xz -9 -T0 > glmark2-${gitdate}git${githash}.tar.xz
-#
-##
-
-## The old launchpad site is still used (for now)
-# bded41aaf918ce062d9b81e42cc5be943e6a80bc4ff9d046983b96102c3df6b5
-Source0:	%{url}/trunk/2014.03/+download/glmark2-2014.03.tar.gz
+URL:		https://github.com/glmark2/glmark2
+Source0:	%{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 
 
 ## The bellow sources are carried by Fedora package maintaners
@@ -94,34 +77,27 @@ Source11:	%{name}-es2-drm.xcf
 # 2d5b3e7c9380d068598f272b2f5b55ca736fa157fd205246a86c2473e08577d4
 Source7:	%{name}.appdata.xml
 
-# https://github.com/glmark2/glmark2/issues/15
-# https://github.com/glmark2/glmark2/pull/19
-Patch0:         glmark2-2014.03-gcc6-sqrt.patch
-
-# https://github.com/glmark2/glmark2/issues/20
-Patch1:         glmark2-2014.03-gcc6-Werror.patch
-
-# https://github.com/glmark2/glmark2/pull/21
-Patch2:         glmark2-2014.03-gcc6-literal-suffix.patch
-
-
-
 
 ##
 ## BRs
 ##
 
+BuildRequires:	gcc-c++
 BuildRequires:	libjpeg-devel
 BuildRequires:	pkgconfig(libpng12)
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(gl)
 BuildRequires:	pkgconfig(egl)
 BuildRequires:	pkgconfig(glesv2)
-BuildRequires:	pkgconfig(libdrm)
 BuildRequires:	pkgconfig(gbm)
-BuildRequires:	python
+BuildRequires:	pkgconfig(libdrm)
+BuildRequires:	pkgconfig(libudev)
+BuildRequires:	pkgconfig(wayland-client)
+BuildRequires:	pkgconfig(wayland-egl)
+BuildRequires:	python2-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	appdata-tools
+BuildRequires:	waf
 
 
 
@@ -151,22 +127,22 @@ Common graphical assets for Glmark2 benchmark suite
 
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1 -n %{name}-%{commit0}
 
 # Remove bundled libraries!
-rm -rv src/libjpeg-turbo src/libpng
+rm -r src/libjpeg-turbo src/libpng
+rm -r waf waflib
 
 %build
-./waf configure	--with-flavors="drm-gl,drm-glesv2,x11-gl,x11-glesv2" --prefix=%{_usr}
+%{_bindir}/waf configure \
+  --with-flavors="x11-gl,x11-glesv2,drm-gl,wayland-gl,wayland-glesv2,drm-glesv2" \
+  --prefix=%{_usr} \
 
-./waf -v
+%{_bindir}/waf -v %{?_smp_mflags}
 
 
 %install
-./waf install -v --destdir=%{buildroot}
+%{_bindir}/waf install -v --destdir=%{buildroot}
 
 
 ## The .desktop files
@@ -205,7 +181,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 
 %files
 ## the x11 opengl benchmark
-%doc NEWS README COPYING COPYING.SGI
+%doc NEWS README
+%license COPYING COPYING.SGI
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/pixmaps/%{name}.png
@@ -241,6 +218,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.ap
 
 
 %changelog
+* Tue Jul 17 2018 Nicolas Chauvet <kwizart@gmail.com> - 2017.07-1.20180407git0003eff
+- Bump to 2017.07 snapshot
+- Switch to github
+- Switch to system waf
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2014.03-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index dc3d8f2..d60c602 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-739859cf57d4c8a23452c43e84f66e56  glmark2-2014.03.tar.gz
+SHA512 (glmark2-0003eff.tar.gz) = 3f8ae8fb2b9eb3332d7080aa8a81d4d17d219928c125bc6cf999d1705804f794975a69222bab2d98ca2561561e31d6c1cd4be515a0969ba602919a7109efe621