diff --git a/.gitignore b/.gitignore
index 47bfb69..afb0c8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
+clog
 /php-league-plates-3.1.1-2d8569e.tgz
 /php-league-plates-3.3.0-b1684b6.tgz
+/php-league-plates-3.4.0-6d3ee31.tgz
+/php-league-plates-3.5.0-a6a3238.tgz
+/php-league-plates-3.6.0-12ee651.tgz
diff --git a/php-league-plates-autoload.php b/php-league-plates-autoload.php
deleted file mode 100644
index 62ff099..0000000
--- a/php-league-plates-autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/* Autoloader for league/plates and its dependencies */
-
-require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('League\\Plates\\', __DIR__);
-
diff --git a/php-league-plates.spec b/php-league-plates.spec
index ecf45a4..3f3bc31 100644
--- a/php-league-plates.spec
+++ b/php-league-plates.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-league-plates
 #
-# Copyright (c) 2016 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2016-2024 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 # Github
-%global gh_commit    b1684b6f127714497a0ef927ce42c0b44b45a8af
+%global gh_commit    12ee65166adbc6fb5916fb80b0c0758e49a2d996
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     thephpleague
 %global gh_project   plates
@@ -19,8 +19,8 @@
 %global ns_project   Plates
 
 Name:           php-%{pk_vendor}-%{pk_name}
-Version:        3.3.0
-Release:        6%{?dist}
+Version:        3.6.0
+Release:        3%{?dist}
 Summary:        Native PHP template system
 
 Group:          Development/Libraries
@@ -29,26 +29,25 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 # Create git snapshot as tests are excluded from official tarball
 Source1:        makesrc.sh
-# Autoloader
-Source2:        %{name}-autoload.php
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 5.3
+BuildRequires:  php(language) >= 8.0
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "mikey179/vfsStream": "^1.4",
-#        "phpunit/phpunit": "~4.0",
-#        "squizlabs/php_codesniffer": "~1.5"
-BuildRequires:  php-composer(mikey179/vfsStream) >= 1.4
-BuildRequires:  php-composer(phpunit/phpunit) >= 4.0
+#        "mikey179/vfsstream": "^1.6",
+#        "phpunit/phpunit": "^11.4",
+#        "squizlabs/php_codesniffer": "^3.5"
+BuildRequires:  php-composer(mikey179/vfsStream) >= 1.6
+# phpunit11 not yet available
+BuildRequires:  phpunit10
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-fedora-autoloader-devel
 
 # From composer.json, "require": {
-#        "php": "^5.3 | ^7.0"
-Requires:       php(language) >= 5.3
-# From phpcompatifo report for 3.1.1
+#        "php": "^8.0"
+Requires:       php(language) >= 8.0
+# From phpcompatinfo report for 3.1.1
 Requires:       php-pcre
 Requires:       php-spl
 # Autoloader
@@ -70,15 +69,13 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
-install -pm 644 %{SOURCE2} src/autoload.php
-
 
 %build
-# Nothing
+: Generate classmap autoloader
+phpab --template fedora --output src/autoload.php src
 
 
 %install
-
 # Restore PSR-0 tree
 mkdir -p   %{buildroot}%{_datadir}/php/%{ns_vendor}
 cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}
@@ -97,11 +94,16 @@ require_once '%{_datadir}/php/org/bovigo/vfs/autoload.php';
 EOF
 
 : Run upstream test suite
-%{_bindir}/phpunit --verbose
+ret=0
+for cmd in php php81 php82 php83 php84; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit10 || ret=1
+  fi
+done
+exit $ret
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc *.md
 %doc composer.json
@@ -109,6 +111,65 @@ EOF
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Nov  4 2024 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+- switch to phpunit10
+- raise dependency on PHP 8.0
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 18 2023 Remi Collet <remi@remirepo.net> - 3.5.0-1
+- update to 3.5.0
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jan  6 2021 Remi Collet <remi@remirepo.net> - 3.4.0-1
+- update to 3.4.0
+- raise dependency on PHP 7
+- switch to classmap autoloader
+- switch to phpunit9
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index f171386..ae91498 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-league-plates-3.3.0-b1684b6.tgz) = a792bec24f96df4597b50796951552f528af65a354c067727acdd3e32a70da3eb1d99d709abec248df1ad7f5ca5a2cce00b7de978fea5de770d50f44db7239f7
+SHA512 (php-league-plates-3.6.0-12ee651.tgz) = c93718ae0db9a6126d04f66e044077ba8bacbc172c499fa45510f8b7dc04be81bfd4b1021cbcd3a77918f0d1786f27d15ba62e76a6fa2be100b67e2bd1fd203b