diff --git a/php-myclabs-php-enum.spec b/php-myclabs-php-enum.spec
index 7f6e83c..eb31ceb 100644
--- a/php-myclabs-php-enum.spec
+++ b/php-myclabs-php-enum.spec
@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-myclabs-php-enum
 #
-# Copyright (c) 2017-2021 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText:  Copyright 2017-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    b942d263c641ddb5190929ff840c68f78713e937
+%global gh_commit    e7be26966b7398204a234f8673fdad5ac6277802
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     myclabs
 %global gh_project   php-enum
@@ -17,11 +17,12 @@
 %global ns_vendor    MyCLabs
 %global ns_project   Enum
 %global php_home     %{_datadir}/php
-%global with_tests   0%{!?_without_tests:1}
+
+%bcond_without       tests
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        1.8.3
-Release:        2%{?dist}
+Version:        1.8.5
+Release:        3%{?dist}
 Summary:        PHP Enum implementation
 
 License:        MIT
@@ -31,7 +32,7 @@ Source0:        %{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 BuildArch:      noarch
-%if %{with_tests}
+%if %{with tests}
 # For tests
 BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-reflection
@@ -40,7 +41,7 @@ BuildRequires:  php-spl
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^9.5",
 #        "squizlabs/php_codesniffer": "1.*"
-#        "vimeo/psalm": "^4.6.2"
+#        "vimeo/psalm": "^4.6.2 || ^5.2"
 %global phpunit %{_bindir}/phpunit9
 BuildRequires:  phpunit9 >= 9.5
 # Required by autoloader
@@ -70,11 +71,14 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 
+mv stubs/Stringable.php src/
+
 cat << 'EOF' | tee src/autoload.php
 <?php
 /* Autoloader for %{name} and its dependencies */
 require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
+require_once __DIR__ . '/Stringable.php';
 EOF
 
 
@@ -89,7 +93,7 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 mkdir vendor
 cat << 'EOF' | tee tests/autoload.php
 <?php
@@ -99,7 +103,7 @@ require __DIR__ . '/bootstrap.php';
 EOF
 
 ret=0
-for cmd in "php %{phpunit}" php73 php74 php80 php81; do
+for cmd in "php %{phpunit}" php81 php82 php83 php84; do
   if which $cmd; then
     set $cmd
     $1 ${2:-%{_bindir}/phpunit9} --verbose --bootstrap tests/autoload.php || ret=1
@@ -112,7 +116,6 @@ exit $ret
 
 
 %files
-%{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc composer.json
 %doc README.md
@@ -121,6 +124,40 @@ exit $ret
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Jan 14 2025 Remi Collet <remi@remirepo.net> - 1.8.5-1
+- update to 1.8.5
+- re-license spec file to CECILL-2.1
+
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Aug  4 2022 Remi Collet <remi@remirepo.net> - 1.8.4-1
+- update to 1.8.4
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index e99c5c2..9550475 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-myclabs-php-enum-1.8.3-b942d26.tgz) = 0aa384a587f8150ec56299043968a42bc0cac2c85204976bd57d9f0650d849458ec906ffa6568ed76f369bfadc81f06f2399cf3e1ad9dfdd3e673d71527186ef
+SHA512 (php-myclabs-php-enum-1.8.5-e7be269.tgz) = 40002568d2ae96f62c6157a1f76f6e7c8f55dd0ca1e73554958533d9a178a05ff53a847a712f72d3cfa295cc49c452df9f1f71ad14c79f0e1b4a1b86df6b596f