diff --git a/.gitignore b/.gitignore
index 138c698..7a539f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /php-sebastian-exporter3-3.1.1-06a9a59.tar.gz
 /php-sebastian-exporter3-3.1.2-68609e1.tar.gz
 /php-sebastian-exporter3-3.1.3-6b85314.tar.gz
+/php-sebastian-exporter3-3.1.4-0c32ea2.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-sebastian-exporter3.spec b/php-sebastian-exporter3.spec
index 4db25ab..3243171 100644
--- a/php-sebastian-exporter3.spec
+++ b/php-sebastian-exporter3.spec
@@ -1,18 +1,20 @@
 # remirepo/fedora spec file for php-sebastian-exporter3
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    6b853149eab67d4da22291d36f5b0631c0fd856e
+%global gh_commit    0c32ea2e40dbf59de29f3b49bf375176ce7dd8db
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   exporter
 %global pk_vendor    sebastian
 %global pk_project   %{gh_project}
+%global ns_vendor    SebastianBergmann
+%global ns_project   Exporter
 %global major        3
 %global php_home     %{_datadir}/php
 %global pear_name    Exporter
@@ -23,40 +25,35 @@
 %global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
 %endif
 
+# NOTICE: used by phpunit 6, 7 and 8
+
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.1.3
-Release:        2%{?dist}
-Summary:        Export PHP variables for visualization
+Version:        3.1.4
+Release:        1%{?dist}
+Summary:        Export PHP variables for visualization, version %{major}
 
 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.0
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.0",
+#        "phpunit/phpunit": "^8.5",
 #        "ext-mbstring": "*"
-BuildRequires:  phpunit6
+BuildRequires:  phpunit8
 BuildRequires:  php-mbstring
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4)
-%else
-BuildRequires:  php-sebastian-recursion-context3
-%endif
 %endif
 
 # from composer.json
 #        "php": ">=7.0",
 #        "sebastian/recursion-context": "^3.0"
 Requires:       php(language) >= 7.0
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:       (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4)
-%else
-Requires:       php-sebastian-recursion-context3
-%endif
 # from phpcompatinfo report for version 3.0.0
 Requires:       php-mbstring
 Requires:       php-pcre
@@ -82,13 +79,13 @@ phpab --template fedora --output src/autoload.php src
 # Rely on include_path as in PHPUnit dependencies
 cat <<EOF | tee -a src/autoload.php
 // Dependency' autoloader
-require_once 'SebastianBergmann/RecursionContext3/autoload.php';
+require_once '%{php_home}/%{ns_vendor}/RecursionContext3/autoload.php';
 EOF
 
 
 %install
-mkdir -p   %{buildroot}%{php_home}/SebastianBergmann
-cp -pr src %{buildroot}%{php_home}/SebastianBergmann/Exporter%{major}
+mkdir -p   %{buildroot}%{php_home}/%{ns_vendor}
+cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %if %{with_tests}
@@ -98,10 +95,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php72 php73 php74 php80; do
+for cmd in php php73 php74 php80 php81; do
   if which $cmd; then
-    %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
-    %{_bindir}/phpunit6  --verbose || ret=1
+    %{_bindir}/php -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+    %{_bindir}/phpunit8	  --verbose || ret=1
   fi
 done
 exit $ret
@@ -109,14 +106,18 @@ exit $ret
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md
 %doc composer.json
-%{php_home}/SebastianBergmann/Exporter%{major}
+%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %changelog
+* Mon Nov 15 2021 Remi Collet <remi@remirepo.net> - 3.1.4-1
+- update to 3.1.4
+- sources from git snapshot
+- switch to phpunit8
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 9f16a8b..bd4e57e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sebastian-exporter3-3.1.3-6b85314.tar.gz) = 224f3b3dd3428a6861f6f6f63dee772285a4db9557492901c82fc867f82025ca66a0ac1b4d8a791cbf0a4692e479420f5f191904bbacd65242737d55dbe13d9d
+SHA512 (php-sebastian-exporter3-3.1.4-0c32ea2.tgz) = 44c966861fa8fa1c7d5e0571e436932cc25e858ce8c0f2f5dbee85287a5015bf64b4707cad882fc0702594858cfe01ca76b72d3ee96685d942f5d98a4f2ba57b