diff --git a/mesa-demos.be0 b/mesa-demos.be0
index fe6bd186f..79b86ced6 100755
--- a/mesa-demos.be0
+++ b/mesa-demos.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION mesa-demos-8.3.0-0
+# BEE_VERSION mesa-demos-8.4.0-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://mesa.freedesktop.org/archive/demos/${PKGVERSION}/mesa-demos-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://mesa.freedesktop.org/archive/demos/mesa-demos-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -61,10 +61,23 @@ SRCURL[0]="https://mesa.freedesktop.org/archive/demos/${PKGVERSION}/mesa-demos-$
 #    bee_build
 #}
 
-#mee_install() {
-#    bee_install
-#}
-## by default this may be 'make install DESTDIR="${D}"'
+# Install all the demos (including the pointless ones) at first, in a
+# temporary location:
+mee_install() {
+    start_cmd make install DESTDIR=${D}/cruft
+}
+
+# Install gears and glinfo, as well as a few other demos:
+mee_install_post() {
+    mkdir -p ${D}/usr/bin
+    for demo in gears glinfo glthreads glxcontexts glxdemo glxgears \
+      glxgears_fbconfig glxheads glxinfo glxpbdemo glxpixmap ; do
+      mv --verbose ${D}/cruft/usr/bin/$demo ${D}/usr/bin
+    done
+    # Remove cruft:
+    rm -rf ${D}/cruft
+}
+
 
 ###############################################################################
 ##