diff --git a/.gitignore b/.gitignore
index c199650..cf193cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /php-netresearch-jsonmapper-3.0.0-d3f0e81.tgz
 /php-netresearch-jsonmapper-3.1.0-923d59d.tgz
 /php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz
+/php-netresearch-jsonmapper-4.0.0-8bbc021.tgz
diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec
index e682d38..ca21d54 100644
--- a/php-netresearch-jsonmapper.spec
+++ b/php-netresearch-jsonmapper.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-netresearch-jsonmapper
 #
-# Copyright (c) 2017-2020 Remi Collet
+# Copyright (c) 2017-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    ba09f0e456d4f00cef84e012da5715625594407c
+%global gh_commit    8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cweiske
 %global gh_project   jsonmapper
@@ -18,7 +18,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        3.1.1
+Version:        4.0.0
 Release:        1%{?dist}
 Summary:        Map nested JSON structures onto PHP classes
 
@@ -31,27 +31,27 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
-BuildRequires:  php(language) >= 5.6
+BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-spl
 BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
+#        "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
 #        "squizlabs/php_codesniffer": "~3.5"
-%global phpunit %{_bindir}/phpunit7
-BuildRequires: phpunit7
+%global phpunit %{_bindir}/phpunit9
+BuildRequires: phpunit9
 # Required by autoloader
 BuildRequires:  php-fedora-autoloader-devel
 %endif
 
 # From composer.json, "require": {
-#        "php": ">=5.6",
+#        "php": ">=7.1",
 #        "ext-spl": "*",
 #        "ext-json": "*",
 #        "ext-pcre": "*",
 #        "ext-reflection": "*"
-Requires:       php(language) >= 5.6
+Requires:       php(language) >= 7.1
 Requires:       php-spl
 Requires:       php-json
 Requires:       php-pcre
@@ -103,10 +103,10 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" php72 php73 php74 php80; do
+for cmd in "php %{phpunit}" php73 php74 php80 php81; do
   if which $cmd; then
     set $cmd
-    $1 ${2:-%{_bindir}/phpunit7} \
+    $1 ${2:-%{_bindir}/phpunit9} \
       --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \
       --no-coverage \
       --verbose . || ret=1
@@ -128,6 +128,11 @@ exit $ret
 
 
 %changelog
+* Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 4.0.0-1
+- update to 4.0.0
+- raise dependency on PHP 7.1
+- switch to phpunit9
+
 * Tue Nov  3 2020 Remi Collet <remi@remirepo.net> - 3.1.1-1
 - update to 3.1.1
 
diff --git a/sources b/sources
index ff68b26..394b61d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz) = eeff60f8fc2e1e7f705d97b12fb1ba80e3490a91557d046a655a4ebe415b98fb07890de18aebb6c76321903d0285541a1aa482da1e3238ea2dfe84e5eafa67a8
+SHA512 (php-netresearch-jsonmapper-4.0.0-8bbc021.tgz) = 6c566ad8a86bab45a6633a6e39e92cde2e1c8f3c107b1fca36a4061c3dc05bd9c5bfcf42309590f05f508fd3c0dcb0968585c14083735d26af1fa2293d5076d5