diff --git a/.gitignore b/.gitignore
index 5e13f82..6d03139 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /php-phpunit-php-token-stream4-4.0.1-cdc0db5.tgz
 /php-phpunit-php-token-stream4-4.0.2-e61c593.tgz
 /php-phpunit-php-token-stream4-4.0.3-5672711.tgz
+/php-phpunit-php-token-stream4-4.0.4-a853a0e.tgz
diff --git a/php-phpunit-php-token-stream4.spec b/php-phpunit-php-token-stream4.spec
index e028a3a..37c4d12 100644
--- a/php-phpunit-php-token-stream4.spec
+++ b/php-phpunit-php-token-stream4.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-phpunit-php-token-stream4
 #
-# Copyright (c) 2010-2020 Christof Damian, Remi Collet
+# Copyright (c) 2010-2023 Christof Damian, Remi Collet
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -8,7 +8,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    5672711b6b07b14d5ab694e700c62eeb82fcf374
+%global gh_commit    a853a0e183b9db7eed023d7933a858fa1c8d25a3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-token-stream
@@ -26,11 +26,11 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        4.0.3
-Release:        1%{?dist}
+Version:        4.0.4
+Release:        15%{?dist}
 Summary:        Wrapper around PHP tokenizer extension
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
@@ -70,6 +70,15 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
+cat << 'EOF' | tee -a src/NewTokens.php
+<?php declare(strict_types=1);
+
+// From PHP 8.1
+class PHP_Token_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG extends PHP_Token
+{
+}
+EOF
+
 
 %build
 # Generate the Autoloader
@@ -88,7 +97,7 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php80 php81 php82; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit9  --verbose || ret=1
@@ -109,6 +118,54 @@ exit $ret
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 29 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Apr 20 2023 Remi Collet <remi@remirepo.net> - 4.0.4-8
+- use SPDX license ID
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Nov  4 2021 Remi Collet <remi@remirepo.net> - 4.0.4-4
+- add missing token from PHP 8.1
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 4.0.4-1
+- update to 4.0.4
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 4.0.3-1
 - update to 4.0.3
 
diff --git a/sources b/sources
index 526b04f..5f254f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpunit-php-token-stream4-4.0.3-5672711.tgz) = c6af1c1f131210ae114c60f05b33f21b6b9a1ba83c96e89c631788ab09ac38378e3ab2cd6e2e2d8c1313ce6f2553851136c0f8ca83f0c9013f861cf3da3f90bc
+SHA512 (php-phpunit-php-token-stream4-4.0.4-a853a0e.tgz) = aa35faeecf4d3c6dbda48f033a22de9be00e7115b822813f65082d12cf80be970571663db8a0f25fae8d41327cc5d6c9e70827f88b13c06dacce733bfe5b9781