diff --git a/.gitignore b/.gitignore
index 35b1a7e..08edfa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /phpunit8-8.*.tar.gz
+/phpunit8-8.5.5-63dda3b.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 7b0d8e8..9b04fc3 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    8474e22d7d642f665084ba5ec780626cbd1efd23
+%global gh_commit    63dda3b212a0025d380a745f91bdb4d8c985adb7
 #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    4
 %global specrel      1
 
 Name:           %{pk_project}%{ver_major}
-Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
+Version:        8.5.5
 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
@@ -237,6 +237,10 @@ exit $ret
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index e2562ab..4f16ae7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit8-8.5.4-8474e22.tar.gz) = ef95d618af84220fac4dfc1ae56c7e1be3bd153fe7afef8baa68547049f2a1d44ba097696cbdf85c55c2675d60a0b30a20f9513a906123e7ab20c934f7360bf5
+SHA512 (phpunit8-8.5.5-63dda3b.tgz) = 6ddd792a3e13b1c6ea33d6b45f669916ecf1f4c2810aa9e23cb6d4a664d2aa60033118989ee6400621bbe7e930fc09c0443146f42bb98c2808c2bf03d27bf4fb