diff --git a/.gitignore b/.gitignore
index 35b1a7e..f000b96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
 clog
 /phpunit8-8.*.tar.gz
+/phpunit8-8.5.5-63dda3b.tgz
+/phpunit8-8.5.6-3f9c407.tgz
+/phpunit8-8.5.8-34c18ba.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..8152336
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_vendor/{s/.* //;p}'  $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/phpunit8.spec b/phpunit8.spec
index e2f6888..60e6664 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    018b6ac3c8ab20916db85fa91bf6465acb64d1e0
+%global gh_commit    34c18baa6a44f1d1fbf0338907139e9dce95b997
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_vendor    sebastianbergmann
@@ -24,17 +24,17 @@
 %global php_home     %{_datadir}/php
 %global ver_major    8
 %global ver_minor    5
-%global ver_patch    2
 %global specrel      1
 
 Name:           %{pk_project}%{ver_major}
-Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
+Version:        8.5.8
 Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
 License:        BSD
 URL:            https://github.com/%{gh_vendor}/%{gh_project}
-Source0:        https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 # Fix command for autoload
 Patch0:         %{name}-rpm.patch
@@ -189,6 +189,10 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/PharIo/Manifest/autoload.php',
     '%{php_home}/PharIo/Version/autoload.php',
 ]);
+// Extensions
+\Fedora\Autoloader\Dependencies::optional(
+    glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php")
+);
 EOF
 cat src/autoload.php
 
@@ -204,6 +208,7 @@ cat src/autoload.php
 %install
 mkdir -p       %{buildroot}%{php_home}
 cp -pr src     %{buildroot}%{php_home}/%{ns_vendor}
+mkdir          %{buildroot}%{php_home}/%{ns_vendor}/Extensions
 
 install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name}
 install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd
@@ -215,7 +220,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
 sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
 
 ret=0
-for cmd in php php72 php73 php74; do
+for cmd in php php72 php73 php74 php80; do
   if which $cmd; then
      $cmd ./phpunit $OPT --verbose || ret=1
   fi
@@ -232,6 +237,23 @@ exit $ret
 
 
 %changelog
+* Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 8.5.8-1
+- update to 8.5.8
+
+* Mon Jun 15 2020 Remi Collet <remi@remirepo.net> - 8.5.6-1
+- update to 8.5.6
+
+* Sat May 23 2020 Remi Collet <remi@remirepo.net> - 8.5.5-1
+- update to 8.5.5
+- sources from git snapshot
+
+* Thu Apr 23 2020 Remi Collet <remi@remirepo.net> - 8.5.4-1
+- update to 8.5.4
+
+* Tue Mar 31 2020 Remi Collet <remi@remirepo.net> - 8.5.3-1
+- update to 8.5.3
+- own /usr/share/php/PHPUnit8/Extensions
+
 * Wed Jan  8 2020 Remi Collet <remi@remirepo.net> - 8.5.2-1
 - update to 8.5.2
 
diff --git a/sources b/sources
index 7cd7d85..0714d80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit8-8.5.2-018b6ac.tar.gz) = 8f11ccd733740a1b9a926a11f5d070fb48cdc176416b3820e37611f11e8bc8bc92b29bcb985d6fcf1d9cc69a4ab1b75d25f8d039c9b686df492c196e9f7954fc
+SHA512 (phpunit8-8.5.8-34c18ba.tgz) = 27d70638c60e8951d090bab61f7cb4017e7479930dc7dd83b708bffe23ba4c49b647d3ce2f73b01bf92d81a1cb0c56025ece999dae31076a71117ddda3dc7506