diff --git a/.gitignore b/.gitignore
index 5fa33e4..ae4f48d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /DynaLoader-Functions-0.001.tar.gz
 /DynaLoader-Functions-0.002.tar.gz
 /DynaLoader-Functions-0.003.tar.gz
+/DynaLoader-Functions-0.004.tar.gz
diff --git a/perl-DynaLoader-Functions.rpmlintrc b/perl-DynaLoader-Functions.rpmlintrc
index 3c67f8c..b1e9098 100644
--- a/perl-DynaLoader-Functions.rpmlintrc
+++ b/perl-DynaLoader-Functions.rpmlintrc
@@ -1,2 +1,5 @@
-from Config import *
+# Tests are self-documenting
 addFilter("-tests.noarch: W: no-documentation");
+
+# This file gets compiled during the running of the test suite
+addFilter("-tests.noarch: W: devel-file-in-non-devel-package /usr/libexec/perl-DynaLoader-Functions/t/dyna_low.c")
diff --git a/perl-DynaLoader-Functions.spec b/perl-DynaLoader-Functions.spec
index 663806f..e2e1a33 100644
--- a/perl-DynaLoader-Functions.spec
+++ b/perl-DynaLoader-Functions.spec
@@ -8,13 +8,15 @@
 %endif
 
 Name:           perl-DynaLoader-Functions
-Version:        0.003
-Release:        18%{?dist}
+Version:        0.004
+Release:        1%{?dist}
 Summary:        Deconstructed dynamic C library loading
 License:        GPL-1.0-or-later OR Artistic-1.0-Perl
 URL:            https://metacpan.org/release/DynaLoader-Functions
 Source0:        https://cpan.metacpan.org/authors/id/Z/ZE/ZEFRAM/DynaLoader-Functions-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  coreutils
+BuildRequires:  findutils
 BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
 BuildRequires:  perl(Module::Build)
@@ -28,6 +30,7 @@ BuildRequires:  perl(DynaLoader)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(parent)
 # Tests:
+BuildRequires:  perl-devel
 BuildRequires:  perl(Test::More)
 %if %{with perl_DynaLoader_Functions_enables_optional_test}
 # Optional tests:
@@ -36,6 +39,7 @@ BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage)
 %endif
+# Dependencies
 Requires:       perl(Carp)
 Requires:       perl(DynaLoader)
 
@@ -68,11 +72,11 @@ for F in t/*.t; do
 done
 
 %build
-perl Build.PL installdirs=vendor optimize="$RPM_OPT_FLAGS"
+perl Build.PL --installdirs=vendor --optimize="%{optflags}"
 ./Build
 
 %install
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+./Build install --destdir=%{buildroot} --create_packlist=0
 # Install tests
 mkdir -p %{buildroot}%{_libexecdir}/%{name}
 cp -a t %{buildroot}%{_libexecdir}/%{name}
@@ -89,20 +93,30 @@ popd
 rm -r "$DIR"
 EOF
 chmod +x %{buildroot}%{_libexecdir}/%{name}/test
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} -c %{buildroot}
 
 %check
 ./Build test
 
 %files
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/DynaLoader/
+%{_mandir}/man3/DynaLoader::Functions.3*
 
 %files tests
 %{_libexecdir}/%{name}
 
 %changelog
+* Fri Apr  7 2023 Paul Howarth <paul@city-fan.org> - 0.004-1
+- Update to 0.004 (rhbz#2185089)
+  - Port test C code to Perl 5.33.1, which defines a PERL_VERSION_GE() macro
+    that clashes with the one this code previously had
+  - In test C code, avoid a compiler warning that arises on Perl 5.20
+  - In test C code, rename some macros for better style
+  - In test C code, better argument parenthesisation in a macro
+- Fix permissions verbosely
+- Make %%files list more explicit
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index cfc866f..40120f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (DynaLoader-Functions-0.003.tar.gz) = 58147714352fbd6e90bb42599e5967c9a93dbb899a587ef8a2a64dd13fc9e24176e17b3c2b870b5fa846b077373ca9ea27bec49b31113a8d9cb7d800f6d29599
+SHA512 (DynaLoader-Functions-0.004.tar.gz) = d888c3763a4d90f9edba21c13df726be11baf48d61b83a68c3d2253cd6b6f8294550b6da2eaa113a50743bab477d9e0a6591dba43877f0dbc363f72ac468fdf7