diff --git a/.gitignore b/.gitignore
index 1396d1b..208c017 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-phpunit-php-invoker3-3.0.0-7579d5a.tar.gz
+/php-phpunit-php-invoker3-3.0.1-62f696a.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..4190c13
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{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/php-phpunit-php-invoker3.spec b/php-phpunit-php-invoker3.spec
index ad30651..09495e4 100644
--- a/php-phpunit-php-invoker3.spec
+++ b/php-phpunit-php-invoker3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    7579d5a1ba7f3ac11c80004d205877911315ae7a
+%global gh_commit    62f696ad0d140e0e513e69eaafdebb674d622b4c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-invoker
@@ -21,19 +21,20 @@
 %global ns_project   Invoker
 
 %if %{bootstrap}
-%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests   0%{?_with_tests:1}
 %else
-%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%global with_tests   0%{!?_without_tests:1}
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        Invoke callables with a timeout
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
 BuildRequires:  php(language) >= 7.3
@@ -43,8 +44,7 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "ext-pcntl": "*"
 #        "phpunit/phpunit": "^9.0"
 BuildRequires:  php-pcntl
-# TODO test suite passes with v8, switch to v9 when available
-BuildRequires:  phpunit8
+BuildRequires:  phpunit9
 %endif
 
 # From composer.json, require
@@ -89,10 +89,10 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74; do
+for cmd in php php73 php74 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit8 --verbose || ret=1
+      %{_bindir}/phpunit9 --verbose || ret=1
   fi
 done
 exit $ret
@@ -108,6 +108,10 @@ exit $ret
 
 
 %changelog
+* Tue Jun 16 2020 Remi Collet <remi@remirepo.net> - 3.0.1-1
+- update to 3.0.1
+- sources from git snapshot
+
 * Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 3.0.0-1
 - update to 3.0.0
 - raise dependency on PHP 7.3
diff --git a/sources b/sources
index 14643fa..7fd881a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-invoker3-3.0.0-7579d5a.tar.gz) = d41f9e266a07fcd0b626f3851621db3a11cf6da4f0c653e6d9eebec543d42d1c1ee82c9385a733f9344241eaee12c292e90651eb6a21a1c62a03ce8c5d44b68f
+SHA512 (php-phpunit-php-invoker3-3.0.1-62f696a.tgz) = d5fcc6c5ab31c87674656f6a1c880df98688fd5c81aae511a2f34bf3e3cba20eada4ad884095a6d05d8396a68944229f64520e2edf687ff02f5a90ff608ce3cd