diff --git a/perl-JSON.spec b/perl-JSON.spec
index 2c27cdc..daa30ed 100644
--- a/perl-JSON.spec
+++ b/perl-JSON.spec
@@ -1,43 +1,38 @@
 Name:           perl-JSON
 Summary:        Parse and convert to JSON (JavaScript Object Notation)
-Version:        4.03
-Release:        5%{?dist}
+Version:        4.04
+Release:        1%{?dist}
 License:        GPL+ or Artistic
-
 URL:            https://metacpan.org/release/JSON
-Source0:        https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/JSON-%{version}.tar.gz
-Requires:       perl(:MODULE_COMPAT_%(eval "`/usr/bin/perl -V:version`"; echo $version))
-Requires:       perl(B)
-Requires:       perl(Encode)
-Requires:       perl(Math::BigFloat)
-Requires:       perl(Math::BigInt)
-Suggests:       perl(Scalar::Util)
-Requires:       perl(warnings)
+Source0:        https://cpan.metacpan.org/modules/by-module/JSON/JSON-%{version}.tar.gz
 BuildArch:      noarch
-
+# Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  make
 BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
-BuildRequires:  perl(:VERSION) >= 5.5.30
-# B not used at tests
-BuildRequires:  perl(base)
-BuildRequires:  perl(bytes)
-BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config)
-BuildRequires:  perl(constant)
-BuildRequires:  perl(Data::Dumper)
-BuildRequires:  perl(Encode)
-BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(lib)
+BuildRequires:  perl(:VERSION) >= 5.5.30
+# Module
+BuildRequires:  perl(B)
+BuildRequires:  perl(bytes)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Math::BigFloat)
 BuildRequires:  perl(Math::BigInt)
 BuildRequires:  perl(overload)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
 # subs not used
+# Tests
+BuildRequires:  perl(charnames)
+BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Test)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod) >= 1.00
@@ -45,7 +40,18 @@ BuildRequires:  perl(Tie::Array)
 BuildRequires:  perl(Tie::Hash)
 BuildRequires:  perl(Tie::IxHash)
 BuildRequires:  perl(utf8)
-BuildRequires:  perl(warnings)
+BuildRequires:  perl(vars)
+# Optional tests
+BuildRequires:  perl(JSON::XS) >= 4.00
+BuildRequires:  perl(Types::Serialiser)
+# Dependencies
+Requires:       perl(:MODULE_COMPAT_%(eval "`/usr/bin/perl -V:version`"; echo $version))
+Requires:       perl(B)
+Requires:       perl(Encode)
+Requires:       perl(Math::BigFloat)
+Requires:       perl(Math::BigInt)
+Suggests:       perl(Scalar::Util)
+Requires:       perl(warnings)
 
 %{?perl_default_filter}
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}perl\\(JSON::(Backend::PP|backportPP::Boolean|Boolean|PP|PP::IncrParser)\\)
@@ -117,6 +123,12 @@ export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print
 %{_libexecdir}/%{name}
 
 %changelog
+* Sat Dec 18 2021 Paul Howarth <paul@city-fan.org> - 4.04-1
+- Update to 4.04
+  - Updated backportPP with JSON::PP 4.07
+- Use author-independent source URL
+- Classify buildreqs by usage
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.03-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 013d427..2d75b48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (JSON-4.03.tar.gz) = 5910818d3a866a50ea655da7d9ae617f21d3bc7e8511d35cff96ec4ea04fe553638c7843422cf2d00c37835a6d9f931b1defd224f57c40a3e52d7cef4684ef8c
+SHA512 (JSON-4.04.tar.gz) = 2dc58adecf947398492264320e793dbbdadab0c7207a63b0e266c149f9da22756040276249c84c82d7d7eb87d8b9bcd74c7ad255b81304adcc55fec253d1862b