diff --git a/mesa-demos.spec b/mesa-demos.spec
index 895e9f4..f2f86bd 100644
--- a/mesa-demos.spec
+++ b/mesa-demos.spec
@@ -1,13 +1,13 @@
 Name:          mesa-demos
-Version:       8.4.0
-Release:       3mamba
+Version:       8.5.0
+Release:       1mamba
 Summary:       Demos for the Mesa GL libraries
 Group:         Applications/Graphics
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://mesa3d.sourceforge.net
-Source:        ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-%{version}.tar.bz2
+URL:           https://www.mesa3d.org/
+Source:        https://archive.mesa3d.org/demos/%{version}/mesa-demos-%{version}.tar.bz2
 Patch0:        %{name}-8.0.1-missing_headers.patch
 Patch1:        mesa-demos-8.0.1-arm-tegra-es2gears-float.patch
 Patch2:        mesa-demos-8.0.1-arm-tegra-eglut-VisualNoMask.patch
@@ -16,19 +16,12 @@ License:       MIT
 BuildRequires: glibc-devel
 BuildRequires: libGLU-devel
 BuildRequires: libX11-devel
-BuildRequires: libXau-devel
-BuildRequires: libXdmcp-devel
 BuildRequires: libXext-devel
-BuildRequires: libffi-devel
 BuildRequires: libfreeglut-devel
-BuildRequires: libgcc
-BuildRequires: libglew-devel
 BuildRequires: libglvnd-devel
 BuildRequires: libmesa-devel
-BuildRequires: libstdc++6-devel
 BuildRequires: libwayland-devel
 BuildRequires: libwayland-egl-devel
-BuildRequires: libxcb-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libmesa-devel
 
@@ -46,7 +39,7 @@ Obsoletes:     mesa-tools < 8.4.0-3mamba
 %description -n mesa-tests
 Test and information tools for the Mesa libraries.
 
-%debug_package
+#% debug_package
 
 %prep
 %setup -q
@@ -59,17 +52,15 @@ Test and information tools for the Mesa libraries.
 %endif
 
 %build
-#:<< _EOF
-%configure \
-   --disable-vg
+%meson
 
-%make -j1
-#LDADD="-lX11 -lpthread"
+%meson_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%meson_install
 
+:<< __OLD
 install -D -m0755 src/egl/opengl/eglgears_x11 %{buildroot}%{_bindir}/eglgears
 install -D -m0755 src/egl/opengl/eglinfo %{buildroot}%{_bindir}/eglinfo
 #install -D -m0755 src/egl/opengles1/gears_x11 %{buildroot}%{_bindir}/es1gears
@@ -87,9 +78,9 @@ rm -f %{buildroot}%{_bindir}/clear
 %defattr(-,root,root)
 %{_bindir}/glxgears
 %{_bindir}/glxinfo
-%{_bindir}/eglgears
+#%{_bindir}/eglgears
 %{_bindir}/eglinfo
-%{_bindir}/es2gears
+%{_bindir}/es2gears*
 %{_bindir}/es2_info
 
 %files
@@ -99,14 +90,17 @@ rm -f %{buildroot}%{_bindir}/clear
 %exclude %{_bindir}/glxinfo
 %exclude %{_bindir}/glxgears
 %exclude %{_bindir}/glxinfo
-%exclude %{_bindir}/eglgears
+#%exclude %{_bindir}/eglgears
 %exclude %{_bindir}/eglinfo
-%exclude %{_bindir}/es2gears
+%exclude %{_bindir}/es2gears*
 %exclude %{_bindir}/es2_info
 %dir %{_datadir}/mesa-demos
 %{_datadir}/mesa-demos/*
 
 %changelog
+* Thu Jun 09 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 8.5.0-1mamba
+- update to 8.5.0
+
 * Wed Apr 21 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 8.4.0-3mamba
 - rebuilt with libmesa