diff --git a/.gitignore b/.gitignore
index aa92ef4..0247db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/CHI-0.60.tar.gz
+/CHI-0.61.tar.gz
diff --git a/perl-CHI-0.60-perl-5.22-regex.diff b/perl-CHI-0.60-perl-5.22-regex.diff
deleted file mode 100644
index 36da549..0000000
--- a/perl-CHI-0.60-perl-5.22-regex.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur CHI-0.60.orig/lib/CHI/t/Driver/Subcache/l1_cache.pm CHI-0.60/lib/CHI/t/Driver/Subcache/l1_cache.pm
---- CHI-0.60.orig/lib/CHI/t/Driver/Subcache/l1_cache.pm	2015-06-07 23:18:17.000000000 +0200
-+++ CHI-0.60/lib/CHI/t/Driver/Subcache/l1_cache.pm	2015-06-18 04:38:08.183298333 +0200
-@@ -45,10 +45,10 @@
-     $stats->flush();
- 
-     $log->contains_ok(
--        qr/CHI stats: {"absent_misses":1,"end_time":\d+,"get_time_ms":\d+,"label":"File","namespace":"Foo","root_class":"CHI","set_key_size":6,"set_time_ms":\d+,"set_value_size":20,"sets":1,"start_time":\d+}/
-+        qr/CHI stats: \{"absent_misses":1,"end_time":\d+,"get_time_ms":\d+,"label":"File","namespace":"Foo","root_class":"CHI","set_key_size":6,"set_time_ms":\d+,"set_value_size":20,"sets":1,"start_time":\d+}/
-     );
-     $log->contains_ok(
--        qr/CHI stats: {"absent_misses":1,"end_time":\d+,"get_time_ms":\d+,"hits":1,"label":"File:l1_cache","namespace":"Foo","root_class":"CHI","set_key_size":6,"set_time_ms":\d+,"set_value_size":20,"sets":1,"start_time":\d+}/
-+        qr/CHI stats: \{"absent_misses":1,"end_time":\d+,"get_time_ms":\d+,"hits":1,"label":"File:l1_cache","namespace":"Foo","root_class":"CHI","set_key_size":6,"set_time_ms":\d+,"set_value_size":20,"sets":1,"start_time":\d+}/
-     );
- 
- }
diff --git a/perl-CHI.spec b/perl-CHI.spec
index bdb16fa..e8bcc69 100644
--- a/perl-CHI.spec
+++ b/perl-CHI.spec
@@ -1,12 +1,11 @@
 Name:           perl-CHI
-Version:        0.60
-Release:        25%{?dist}
+Version:        0.61
+Release:        1%{?dist}
 Summary:        Unified cache handling interface
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/CHI
-Source0:        https://cpan.metacpan.org/authors/id/J/JS/JSWARTZ/CHI-%{version}.tar.gz
-# Workaround "Unescaped left brace in regex is deprecated"
-Patch0:         perl-CHI-0.60-perl-5.22-regex.diff
+Source0:        https://cpan.metacpan.org/authors/id/A/AS/ASB/CHI-%{version}.tar.gz
+
 # RHBZ#1275936
 Patch1:         perl-CHI-0.60-Adapt-to-changes-in-Cache-FastMmap-1.45.patch
 
@@ -16,7 +15,6 @@ BuildArch:      noarch
 
 %bcond_without smoke_tests
 
-BuildRequires: make
 BuildRequires:  %{__perl}
 BuildRequires:  %{__make}
 
@@ -108,20 +106,17 @@ CHI::Test and CHI::t perl modules
 
 %prep
 %setup -q -n CHI-%{version}
-%patch0 -p1
 %patch1 -p1
 
 # Fix bogus permissions
 find lib \( -type f -a -executable \) -exec chmod -x {} \;
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps NO_PACKLIST=1
-%{__make} %{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-%{__make} pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
+%{make_install} DESTDIR="$RPM_BUILD_ROOT"
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
@@ -148,6 +143,11 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{perl_vendorlib}/CHI/Test*
 
 %changelog
+* Thu Oct 21 2021 Ralf Corsépius <corsepiu@fedoraproject.org> - 0.61-1
+- Update to 0.61.
+- Drop perl-CHI-0.60-perl-5.22-regex.diff.
+- Modernize spec.
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.60-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 5330906..9f354bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e559c52c12de4a27b0210caa1c790e65  CHI-0.60.tar.gz
+SHA512 (CHI-0.61.tar.gz) = 16d559af4a86e1064737f00bc36b0a50c8943a37d3ff1ac12327871798d691d9cc98c7c94710ed87749079f986a3c5ef802e95e5bcef5fb2d1c88af4c1e9a0e7