diff --git a/mesa-demos-32/.footprint b/mesa-demos-32/.footprint
index 58d712ea..80fd1eba 100644
--- a/mesa-demos-32/.footprint
+++ b/mesa-demos-32/.footprint
@@ -1,4 +1,32 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/eglinfo-32
+-rwxr-xr-x	root/root	usr/bin/es2_info-32
+-rwxr-xr-x	root/root	usr/bin/es2gears_x11-32
+-rwxr-xr-x	root/root	usr/bin/es2tri-32
+-rwxr-xr-x	root/root	usr/bin/glsync-32
+-rwxr-xr-x	root/root	usr/bin/glthreads-32
+-rwxr-xr-x	root/root	usr/bin/glxcontexts-32
+-rwxr-xr-x	root/root	usr/bin/glxdemo-32
 -rwxr-xr-x	root/root	usr/bin/glxgears-32
+-rwxr-xr-x	root/root	usr/bin/glxgears_fbconfig-32
+-rwxr-xr-x	root/root	usr/bin/glxgears_pixmap-32
+-rwxr-xr-x	root/root	usr/bin/glxheads-32
 -rwxr-xr-x	root/root	usr/bin/glxinfo-32
+-rwxr-xr-x	root/root	usr/bin/glxpbdemo-32
+-rwxr-xr-x	root/root	usr/bin/glxpixmap-32
+-rwxr-xr-x	root/root	usr/bin/glxsnoop-32
+-rwxr-xr-x	root/root	usr/bin/glxswapcontrol-32
+-rwxr-xr-x	root/root	usr/bin/manywin-32
+-rwxr-xr-x	root/root	usr/bin/multictx-32
+-rwxr-xr-x	root/root	usr/bin/offset-32
+-rwxr-xr-x	root/root	usr/bin/overlay-32
+-rwxr-xr-x	root/root	usr/bin/pbdemo-32
+-rwxr-xr-x	root/root	usr/bin/pbinfo-32
+-rwxr-xr-x	root/root	usr/bin/shape-32
+-rwxr-xr-x	root/root	usr/bin/sharedtex-32
+-rwxr-xr-x	root/root	usr/bin/sharedtex_mt-32
+-rwxr-xr-x	root/root	usr/bin/texture_from_pixmap-32
+-rwxr-xr-x	root/root	usr/bin/wincopy-32
+-rwxr-xr-x	root/root	usr/bin/xfont-32
+-rwxr-xr-x	root/root	usr/bin/xrotfontdemo-32
diff --git a/mesa-demos-32/.signature b/mesa-demos-32/.signature
index 979a8f19..21046880 100644
--- a/mesa-demos-32/.signature
+++ b/mesa-demos-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXZ+8iTAL8lj8toUpW6HsagxPJWdKSDvAf9J+17npEbUKVbPvt1dQlnF2IIxyngXGWxNizSCgU8aahf9m7pcUNAo=
-SHA256 (Pkgfile) = f64428559db6170ba74a7835446d18d5d2511979fdfce9b51d59207b2dc7be94
-SHA256 (.footprint) = f8bf632f6963622eaf1476d0ffa4fb93dbfe24daa590f8f6ab151c131d8789d2
-SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d
+RWSwxGo/zH7eXch/NNZ8gJ9f8CN3v8A9skYuGulxBKICZXfsW9h0VqaybI4k8tXGoTNn+fbZ0eh4s/sgbc5mEHdyIPw/EH0twA4=
+SHA256 (Pkgfile) = 042ba250b7b55795b2cab1da8bc466e672654731ddf53cb1c37081503c9dc24f
+SHA256 (.footprint) = 740529199588f77017512e327d02432d4521bc95fe23eea66da5d14fc4b7efa7
+SHA256 (mesa-demos-8.5.0.tar.bz2) = cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1
diff --git a/mesa-demos-32/Pkgfile b/mesa-demos-32/Pkgfile
index 1c0ae8a7..b34959dc 100644
--- a/mesa-demos-32/Pkgfile
+++ b/mesa-demos-32/Pkgfile
@@ -1,21 +1,29 @@
 # Description: Mesa 3D demos
 # URL: https://www.mesa3d.org/
 # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
-# Depends on: glew-32 glu-32
+# Depends on: glew-32 glu-32 libglvnd-32
 
 name=mesa-demos-32
-version=8.4.0
+version=8.5.0
 release=1
-source=(https://archive.mesa3d.org/demos/${name%-*}-$version.tar.bz2)
+source=(https://archive.mesa3d.org/demos/$version/${name%-*}-$version.tar.bz2)
 
 build() {
-	cd ${name%-*}-$version
+	meson setup ${name%-*}-$version build \
+		--prefix=/usr \
+		--libdir=/usr/lib32 \
+		--buildtype=plain \
+		--wrap-mode nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D gles1=disabled \
+		-D with-system-data-files=true \
+		-D osmesa=disabled
+	meson compile -C build
+	DESTDIR=$PKG meson install -C build
 
-	./configure --prefix=/usr
+	local i
+	for i in $PKG/usr/bin/*; do mv "$i" "$i"-32; done
 
-	make -C src/xdemos/ glxinfo glxgears
-
-	install -d $PKG/usr/bin
-	install -m 0755 src/xdemos/glxgears $PKG/usr/bin/glxgears-32
-	install -m 0755 src/xdemos/glxinfo $PKG/usr/bin/glxinfo-32
+	rm -r $PKG/usr/share/
 }