diff --git a/x11/misc/mesa-demos/actions.py b/x11/misc/mesa-demos/actions.py
index f82210944f..782f310775 100644
--- a/x11/misc/mesa-demos/actions.py
+++ b/x11/misc/mesa-demos/actions.py
@@ -13,6 +13,7 @@ demos_dir_emul32 = "/usr/lib32/mesa/demos"
 def setup():
     autotools.autoreconf("-fvi")
     options = "--disable-static \
+               --enable-autotools \
                --with-system-data-files \
                --bindir=%s" % (demos_dir_emul32 if get.buildTYPE() == "emul32" else demos_dir)
 
diff --git a/x11/misc/mesa-demos/pspec.xml b/x11/misc/mesa-demos/pspec.xml
index 1a14f0b737..11a75e7111 100644
--- a/x11/misc/mesa-demos/pspec.xml
+++ b/x11/misc/mesa-demos/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:console</IsA>
         <Summary>Mesa demos</Summary>
         <Description>The Mesa Demos package contains a large number of OpenGL demonstration and test programs.</Description>
-        <Archive sha1sum="57ba892e919fa22ce3db9f25e7331a6fa33c652c" type="tarbz2">ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.bz2</Archive>
+        <Archive sha1sum="c92a3d16630c2d929f016e4c52bc0c9430dfb7ea" type="tarbz2">https://archive.mesa3d.org/demos/8.5.0/mesa-demos-8.5.0.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>glew-devel</Dependency>
             <Dependency>mesa-devel</Dependency>
@@ -93,6 +93,13 @@
     </Package>
     
     <History>
+        <Update release="15">
+            <Date>2022-05-30</Date>
+            <Version>8.5.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="14">
             <Date>2022-03-19</Date>
             <Version>8.4.0</Version>