diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,4 +1,16 @@
+libEGL.so.1
 libGL.so.1
+libGLESv2.so.2
+libGLEW.so.1.12
+libGLU.so.1
+libOSMesa.so.8
 libX11.so.6
+libXext.so.6
 libc.so.6
+libdrm.so.2
+libgbm.so.1
+libglut.so.3
 libm.so.6
+libpthread.so.0
+libwayland-client.so.0
+libwayland-egl.so.1
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,18 +1,27 @@
 name       : mesa-demos
-version    : 8.3.0
-release    : 73
+version    : 8.4.0
+release    : 74
 source     :
-    - https://mesa.freedesktop.org/archive/demos/8.3.0/mesa-demos-8.3.0.tar.gz : 6127c5511e63447b28c2df735739de06c5d221f68e7671cc0ee446e605e92357
+    - https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.gz : b997fe1a07584fdc9f25fc9807ea9fd8df15032d6cf1631aa3ba69f8fe09d633
 license    :
     - BSL-1.0
     - MIT
     - SGI-B-1.0
 component  : xorg.display
-summary    : Demonstrations of the Mesa3D Library
+summary    :
+    - Demonstrations of the Mesa3D Library (glxgears and glxinfo)
+    - all: Demonstrations of the Mesa3D Library (all)
 replaces   :
     - mesalib-demos
 description: |
     Demonstrations of the Mesa3D Library
+patterns   :
+    - all:
+        - /usr/bin
+        - /usr/share/mesa-demos
+    - main:
+        - /usr/bin/glxgears
+        - /usr/bin/glxinfo
 builddeps  :
     - pkgconfig(freetype2)
     - pkgconfig(gl)
@@ -22,10 +31,11 @@
     - pkgconfig(wayland-client)
     - pkgconfig(x11)
     - pkgconfig(xext)
+    - pkgconfig(freeglut)
 setup      : |
     %configure
 build      : |
-    %make -C src/xdemos
+    %make
 install    : |
-    install -D -d -m 00755 $installdir/usr/bin
-    install -m 00755 src/xdemos/glx{gears,info} $installdir/usr/bin/.
+    %make_install
+    install -m 00755 src/egl/opengl/{eglgears_x11,eglinfo,eglkms,egltri_x11,peglgears,xeglgears,xeglthreads} $installdir/usr/bin/
\ No newline at end of file
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,38 +2,49 @@
     <Source>
         <Name>mesa-demos</Name>
         <Packager>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Jan Jedelský</Name>
+            <Email>hjajet@gmail.com</Email>
         </Packager>
         <License>BSL-1.0</License>
         <License>MIT</License>
         <License>SGI-B-1.0</License>
         <PartOf>xorg.display</PartOf>
-        <Summary xml:lang="en">Demonstrations of the Mesa3D Library</Summary>
+        <Summary xml:lang="en">Demonstrations of the Mesa3D Library (glxgears and glxinfo)</Summary>
         <Description xml:lang="en">Demonstrations of the Mesa3D Library
 </Description>
         <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
     </Source>
     <Package>
         <Name>mesa-demos</Name>
-        <Summary xml:lang="en">Demonstrations of the Mesa3D Library</Summary>
+        <Summary xml:lang="en">Demonstrations of the Mesa3D Library (glxgears and glxinfo)</Summary>
         <Description xml:lang="en">Demonstrations of the Mesa3D Library
 </Description>
         <PartOf>xorg.display</PartOf>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="executable">/usr/bin/glxgears</Path>
+            <Path fileType="executable">/usr/bin/glxinfo</Path>
         </Files>
         <Replaces>
             <Package>mesalib-demos</Package>
         </Replaces>
     </Package>
+    <Package>
+        <Name>mesa-demos-all</Name>
+        <Summary xml:lang="en">Demonstrations of the Mesa3D Library (all)</Summary>
+        <Description xml:lang="en">Demonstrations of the Mesa3D Library
+</Description>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/mesa-demos</Path>
+        </Files>
+    </Package>
     <History>
-        <Update release="73">
-            <Date>2017-11-29</Date>
-            <Version>8.3.0</Version>
+        <Update release="74">
+            <Date>2018-04-24</Date>
+            <Version>8.4.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Jan Jedelský</Name>
+            <Email>hjajet@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file