diff --git a/.gitignore b/.gitignore
index f43d858..7b0925d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/mesa-demos-20171027.tar.bz2
+SOURCES/mesa-demos-20181118.tar.bz2
 SOURCES/xdriinfo-1.0.4.tar.bz2
diff --git a/.mesa-demos.metadata b/.mesa-demos.metadata
index bbb0bc6..7c06583 100644
--- a/.mesa-demos.metadata
+++ b/.mesa-demos.metadata
@@ -1,2 +1,2 @@
-24665d677c1767e1782acdc713686ad627abd05c SOURCES/mesa-demos-20171027.tar.bz2
+e2cdd2260f18badda6f80d4baa6ebc30225b0c7e SOURCES/mesa-demos-20181118.tar.bz2
 723482b3fc627d7cc6124fec43dd1c21d102daaa SOURCES/xdriinfo-1.0.4.tar.bz2
diff --git a/SPECS/mesa-demos.spec b/SPECS/mesa-demos.spec
index 11ffd28..edc1bee 100644
--- a/SPECS/mesa-demos.spec
+++ b/SPECS/mesa-demos.spec
@@ -1,15 +1,14 @@
-%global gitdate 20171027
-%global gitcommit 22bc355f1b324b6ea07e063b5f20be757ea7a8e5
+%global gitdate 20181118
+%global gitcommit 1830dcb6e48c88f16d328dc4fc9fa32fe3b4956e
 %global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
 %global xdriinfo xdriinfo-1.0.4
 %global demodir %{_libdir}/mesa
 
 Summary: Mesa demos
 Name: mesa-demos
-Version: 8.3.0
-Release: 9%{?dist}
+Version: 8.4.0
+Release: 4.%{gitdate}git%{shortcommit}%{?dist}
 License: MIT
-Group: System Environment/Libraries
 URL: http://www.mesa3d.org
 #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2
 Source0: mesa-demos-%{gitdate}.tar.bz2
@@ -20,6 +19,7 @@ Patch0: mesa-demos-8.0.1-legal.patch
 Patch1: mesa-demos-as-needed.patch
 # Fix xdriinfo not working with libglvnd
 Patch2: xdriinfo-1.0.4-glvnd.patch
+BuildRequires:  gcc-c++
 BuildRequires: pkgconfig autoconf automake libtool
 BuildRequires: freeglut-devel
 BuildRequires: mesa-libGL-devel
@@ -28,13 +28,14 @@ BuildRequires: mesa-libGLES-devel
 BuildRequires: mesa-libgbm-devel
 BuildRequires: libGLU-devel
 BuildRequires: glew-devel
+BuildRequires: wayland-devel
+BuildRequires: freetype-devel
 
 %description
 This package provides some demo applications for testing Mesa.
 
 %package -n glx-utils
 Summary: GLX utilities
-Group: Development/Libraries
 Provides: glxinfo glxinfo%{?__isa_bits}
 
 %description -n glx-utils
@@ -42,7 +43,6 @@ The glx-utils package provides the glxinfo and glxgears utilities.
 
 %package -n egl-utils
 Summary: EGL utilities
-Group: Development/Libraries
 Provides: eglinfo es2_info
 
 %description -n egl-utils
@@ -62,7 +62,16 @@ rm -rf src/demos/spriteblast.c
 
 %build
 autoreconf -vfi
-%configure --bindir=%{demodir} --with-system-data-files
+%configure \
+    --bindir=%{demodir} \
+    --with-system-data-files \
+    --enable-x11 \
+    --enable-wayland \
+    --enable-gbm \
+    --enable-egl \
+    --enable-gles2 \
+    --enable-libdrm \
+    --enable-freetype2
 make %{?_smp_mflags}
 
 pushd ../%{xdriinfo}
@@ -103,6 +112,28 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir}
 %{_bindir}/es2_info
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-4.20181118git1830dcb
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-3.20181118git1830dcb
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Nov 19 2018 Lyude Paul <lyude@redhat.com> - 8.4.0-2.20181118git1830dcb
+- Start using proper git version strings for rawhide
+- Enabling building of wayland and freetype demos
+
+* Sun Nov 18 2018 Lyude Paul <lyude@redhat.com> - 8.4.0-1
+- New git snapshot
+
+* Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 8.3.0-12
+- Rebuilt for glew 2.1.0
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Fri Oct 27 2017 Adam Jackson <ajax@redhat.com> - 8.3.0-9
 - New git snapshot