diff --git a/.gitignore b/.gitignore
index 4be436f..400b6de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xdriinfo-1.0.3.tar.bz2
 /mesa-demos-20151203.tar.bz2
 /mesa-demos-8.3.0.tar.bz2
 /mesa-demos-20171027.tar.bz2
+/mesa-demos-8.4.0.tar.bz2
diff --git a/mesa-demos.spec b/mesa-demos.spec
index f509830..6497cda 100644
--- a/mesa-demos.spec
+++ b/mesa-demos.spec
@@ -1,18 +1,18 @@
-%global gitdate 20171027
-%global gitcommit 22bc355f1b324b6ea07e063b5f20be757ea7a8e5
-%global shortcommit %(c=%{gitcommit}; echo ${c:0:7})
+#%global gitdate 20171027
+#%global gitcommit 22bc355f1b324b6ea07e063b5f20be757ea7a8e5
+#%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: 10%{?dist}
+Version: 8.4.0
+Release: 1%{?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
+Source0: https://mesa.freedesktop.org/archive/demos/%{name}-%{version}.tar.bz2
+#Source0: mesa-demos-%{gitdate}.tar.bz2
 Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
 Source2: mesad-git-snapshot.sh
 # Patch pointblast/spriteblast out of the Makefile for legal reasons
@@ -28,6 +28,8 @@ 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.
@@ -49,7 +51,7 @@ Provides: eglinfo es2_info
 The egl-utils package provides the eglinfo and es2_info utilities.
 
 %prep
-%setup -q -n %{name}-%{gitdate} -b1
+%setup -q -n %{name}-%{version} -b1
 %patch0 -p1 -b .legal
 %patch1 -p1 -b .asneeded
 pushd ../%{xdriinfo}
@@ -62,7 +64,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 +114,10 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir}
 %{_bindir}/es2_info
 
 %changelog
+* Mon Nov 19 2018 Lyude Paul <lyude@redhat.com> - 8.4.0-1
+- 8.4.0
+- Enabling building of wayland and freetype demos
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 8.3.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 6934e52..4df172a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mesa-demos-20171027.tar.bz2) = 8af9c8e064d06a7e5f59908471f1360b0071f0ccd0633cbe1ceb641b8900f6e261fc1ff55ccbbdef4243180e23d3b1e62cfb5cff00ac4951f28f14a10c1dd337
 SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd
+SHA512 (mesa-demos-8.4.0.tar.bz2) = b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957