diff --git a/.gitignore b/.gitignore
index 1b29059..6e18916 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /php-netresearch-jsonmapper-1.5.0-da74a07.tgz
 /php-netresearch-jsonmapper-1.5.1-047dafe.tgz
 /php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz
+/php-netresearch-jsonmapper-2.0.0-e245890.tgz
diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec
index 30e00e1..4f5324e 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-2018 Remi Collet
+# Copyright (c) 2017-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06
+%global gh_commit    e245890383c3ed38b6d202ee373c23ccfebc0f54
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cweiske
 %global gh_project   jsonmapper
@@ -18,8 +18,8 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.6.0
-Release:        2%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Map nested JSON structures onto PHP classes
 
 License:        OSL 3.0
@@ -37,15 +37,10 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4",
-#        "squizlabs/php_codesniffer": "~1.5"
-%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
-%global phpunit %{_bindir}/phpunit6
-BuildRequires: phpunit6 >= 6.4
-%else
-%global phpunit %{_bindir}/phpunit
-BuildRequires: php-phpunit-PHPUnit >= 4.8.35
-%endif
+#        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
+#        "squizlabs/php_codesniffer": "~3.5"
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7
 # Required by autoloader
 BuildRequires:  php-fedora-autoloader-devel
 %endif
@@ -108,10 +103,10 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" php71 php72 php73 php74; do
+for cmd in "php %{phpunit}" php72 php73 php74; do
   if which $cmd; then
     set $cmd
-    $1 ${2:-%{_bindir}/phpunit6} \
+    $1 ${2:-%{_bindir}/phpunit7} \
       --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \
       --no-coverage \
       --verbose . || ret=1
@@ -133,6 +128,10 @@ exit $ret
 
 
 %changelog
+* Sat Mar 14 2020 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- switch to phpunit7
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 48bea0b..2731aa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz) = dc5763369b150f5a8378e84892eb1795fd899f83612ff989213b3fdc70cdd53e8836013133f4242e519eb16911872449cfbb08f5e951f1cb73f33c03694b4614
+SHA512 (php-netresearch-jsonmapper-2.0.0-e245890.tgz) = e2a8bad42c589d3951041a6c6c624939b7e07f21864b79988f12c0fb3259aa20201273b438e0d2855661a7fcaa98c91406cf19303bf9775a411a4abfd92b3776