diff --git a/.gitignore b/.gitignore
index 728f3da..0969ecb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-File-HomeDir-0.86.tar.gz
+/File-HomeDir-0.86.tar.gz
 /File-HomeDir-0.93.tar.gz
 /File-HomeDir-0.97.tar.gz
 /File-HomeDir-0.98.tar.gz
 /File-HomeDir-0.99.tar.gz
 /File-HomeDir-1.00.tar.gz
 /File-HomeDir-1.002.tar.gz
+/File-HomeDir-1.004.tar.gz
diff --git a/perl-File-HomeDir.spec b/perl-File-HomeDir.spec
index ab9a70c..44fcf01 100644
--- a/perl-File-HomeDir.spec
+++ b/perl-File-HomeDir.spec
@@ -1,15 +1,15 @@
 Name:           perl-File-HomeDir
-Version:        1.002
-Release:        4%{?dist}
+Version:        1.004
+Release:        1%{?dist}
 Summary:        Find your home and other directories on any platform
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/File-HomeDir/
 Source0:        http://www.cpan.org/authors/id/R/RE/REHSACK/File-HomeDir-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  coreutils
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(:VERSION) >= 5.5.3
 BuildRequires:  perl(Config)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
@@ -17,6 +17,7 @@ BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
 # Run-time:
+BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Cwd) >= 3.12
 BuildRequires:  perl(Exporter)
@@ -31,16 +32,16 @@ BuildRequires:  perl(vars)
 # Tests:
 BuildRequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(Test::More) >= 0.90
+# Dependencies:
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Cwd) >= 3.12
-Requires:       perl(Exporter)
 Requires:       perl(File::Path) >= 2.01
 Requires:       perl(File::Spec) >= 3.12
 Requires:       perl(File::Temp) >= 0.19
 Requires:       perl(File::Which) >= 0.05
 
-%{?perl_default_filter}
-%global __requires_exclude %{?__requires_exclude}|perl\\(Cwd\\)|perl\\(File::Path\\)|perl\\(File::Spec\\)|perl\\(File::Temp\\)|perl\\(File::Which\\)|perl\\(Mac::|perl\\(Win32
+# Remove unwanted and under-specified dependencies
+%global __requires_exclude perl\\(Cwd\\)|perl\\(File::Path\\)|perl\\(File::Spec\\)|perl\\(File::Temp\\)|perl\\(File::Which\\)|perl\\(Mac::|perl\\(Win32
 
 %description
 File::HomeDir is a module for locating the directories that are "owned"
@@ -52,12 +53,12 @@ platforms.
 %setup -q -n File-HomeDir-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=%{buildroot}
-chmod -R u+w %{buildroot}/*
+make install DESTDIR=%{buildroot}
+%{_fixperms} -c %{buildroot}
 
 %check
 make test
@@ -66,9 +67,21 @@ make test
 %license LICENSE
 %doc Changes README.md
 %{perl_vendorlib}/File/
-%{_mandir}/man3/*.3pm*
+%{_mandir}/man3/File::HomeDir.3*
+%{_mandir}/man3/File::HomeDir::Darwin.3*
+%{_mandir}/man3/File::HomeDir::Darwin::Carbon.3*
+%{_mandir}/man3/File::HomeDir::Darwin::Cocoa.3*
+%{_mandir}/man3/File::HomeDir::Driver.3*
+%{_mandir}/man3/File::HomeDir::FreeDesktop.3*
+%{_mandir}/man3/File::HomeDir::MacOS9.3*
+%{_mandir}/man3/File::HomeDir::Test.3*
+%{_mandir}/man3/File::HomeDir::Unix.3*
+%{_mandir}/man3/File::HomeDir::Windows.3*
 
 %changelog
+* Thu May  3 2018 Paul Howarth <paul@city-fan.org> - 1.004-1
+- 1.004 bump
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.002-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index bcba255..0dbb1ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (File-HomeDir-1.002.tar.gz) = 4862c78f65785579d4978d3c4d36ba2a71fb78f069b5671d0cedabd6d187fb4377ae40be45b0abfb00df8dd362fbc28032aab2f39acbbe9f1d7bc4a5b24863d4
+SHA512 (File-HomeDir-1.004.tar.gz) = 21671f6badb23fc7e89ef7507266a0b85b9bbf38897b24651f6a84795b5174dd4bfa43251231cbdb1566183e12b253e2504f1fe0f8e195c35d9b5e3d639aa334