diff --git a/.gitignore b/.gitignore
index e4240a0..0a25e82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,12 @@
 clog
 /php-nikic-php-parser4-4.2.5-b76bbc3.tgz
 /php-nikic-php-parser4-4.3.0-9a9981c.tgz
+/php-nikic-php-parser4-4.4.0-bd43ec7.tgz
+/php-nikic-php-parser4-4.5.0-53c2753.tgz
+/php-nikic-php-parser4-4.6.0-c346bbf.tgz
+/php-nikic-php-parser4-4.8.0-8c58eb4.tgz
+/php-nikic-php-parser4-4.9.0-aaee038.tgz
+/php-nikic-php-parser4-4.9.1-88e5197.tgz
+/php-nikic-php-parser4-4.10.0-1c13d05.tgz
+/php-nikic-php-parser4-4.10.1-1b479e7.tgz
+/php-nikic-php-parser4-4.10.2-658f1be.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 36670e4..dcb114d 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-nikic-php-parser4
 #
-# Copyright (c) 2016-2019 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    9a9981c347c5c49d6dfe5cf826bb882b824080dc
+%global gh_commit    658f1be311a230e0907f5dfe0213742aff0596de
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,7 +21,7 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.3.0
+Version:        4.10.2
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -36,7 +36,8 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
-BuildRequires:  php(language) >= 7.0
+# as we use phpunit8
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-tokenizer
 BuildRequires:  php-reflection
 BuildRequires:  php-ctype
@@ -44,12 +45,12 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0",
-#        "ircmaxell/php-yacc": "0.0.5"
+#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
+#        "ircmaxell/php-yacc": "0.0.7"
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-fedora-autoloader-devel
 %endif
 
 # From composer.json, "require": {
@@ -65,7 +66,7 @@ Requires:       php-pcre
 Requires:       php-spl
 Requires:       php-cli
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_owner}/%{pk_project}) = %{version}
 
@@ -88,14 +89,10 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
 
 
 %build
-: Generate an simple PSR-4 autoloader
-cat << 'AUTOLOAD' | tee lib/%{ns_project}/autoload.php
-<?php
-/* Autoloader for %{name} and its dependencies */
-require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', __DIR__);
-AUTOLOAD
+: Generate an simple classmap autoloader
+phpab --template fedora \
+      --output lib/%{ns_project}/autoload.php \
+      lib/%{ns_project}
 
 
 %install
@@ -118,19 +115,24 @@ php bin/php-parse-test --help
 mkdir vendor
 cat << 'AUTOLOAD' | tee vendor/autoload.php
 <?php
-require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', dirname(__DIR__).'/test/PhpParser/');
 AUTOLOAD
 
 : Upstream test suite
-# ignore test failing on 32-bit (in koji)
+BITS=$(php -r 'echo PHP_INT_SIZE;')
+if [ $BITS -lt 8 ]; then
+   # ignore test failing on 32-bit (in koji)
+   FILTER="--filter '^((?!(testParse|testLexNewFeatures)).)*$'"
+else
+   FILTER=""
+fi
+
 ret=0
-for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php72%{_bindir}/phpunit8" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit8} \
-      --filter '^((?!(testParse|testLexNewFeatures)).)*$' \
-      --verbose || ret=1
+    $1 -d auto_prepend_file=%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php \
+      ${2:-%{_bindir}/phpunit9} $FILTER --verbose || ret=1
   fi
 done
 exit $ret
@@ -148,6 +150,37 @@ exit $ret
 
 
 %changelog
+* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 4.10.2-1
+- update to 4.10.2
+
+* Thu Sep 24 2020 Remi Collet <remi@remirepo.net> - 4.10.1-1
+- update to 4.10.1
+
+* Sun Sep 20 2020 Remi Collet <remi@remirepo.net> - 4.10.0-1
+- update to 4.10.0
+
+* Mon Aug 31 2020 Remi Collet <remi@remirepo.net> - 4.9.1-1
+- update to 4.9.1
+
+* Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 4.9.0-1
+- update to 4.9.0
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 4.8.0-1
+- update to 4.8.0
+
+* Fri Jul  3 2020 Remi Collet <remi@remirepo.net> - 4.6.0-1
+- update to 4.6.0
+
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 4.5.0-2
+- switch to classmap autoloader
+- add missing dependency on fedora/autoloader
+
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 4.5.0-1
+- update to 4.5.0
+
+* Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 4.4.0-1
+- update to 4.4.0
+
 * Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 4.3.0-1
 - update to 4.3.0
 
diff --git a/sources b/sources
index 6fc7ca3..5407fe6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.3.0-9a9981c.tgz) = f7aa21e66e3b9851099a5f1deee2d797c187707f9262ee604d4b19a1acfef68395ec0461c8439cb67b21e116dbcfdb3e51a71950f3aff753e5e2d473c0c7c0ae
+SHA512 (php-nikic-php-parser4-4.10.2-658f1be.tgz) = 7565a6314056e56e0b207e83ab91c9b76dd714aa9c86bf7eac6ed5416e5f04b750522164a5944eaadd8e047d75b3f46f16a6b91604c5e998c8a0b43e61de3125