diff --git a/perl-File-Which.spec b/perl-File-Which.spec
index 4bc3a03..82f46af 100644
--- a/perl-File-Which.spec
+++ b/perl-File-Which.spec
@@ -1,26 +1,23 @@
 Name:           perl-File-Which
 Version:        1.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Portable implementation of the 'which' utility
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/File-Which/
-Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-Which-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/P/PL/PLICEASE/File-Which-%{version}.tar.gz
 BuildArch:      noarch
 BuildRequires:  perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(strict)
 # Run-time:
-%if !%{defined perl_bootstrap}
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(File::Spec) >= 0.60
-BuildRequires:  perl(Getopt::Std)
-BuildRequires:  perl(vars)
+BuildRequires:  perl(warnings)
 # Tests:
+BuildRequires:  perl(Config)
 BuildRequires:  perl(Test::More) >= 0.80
-BuildRequires:  perl(Test::Script) >= 1.05
-%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(File::Spec) >= 0.60
 
@@ -30,9 +27,7 @@ Requires:       perl(File::Spec) >= 0.60
 %description
 File::Which is a portable implementation (in Perl) of 'which', and can
 be used to get the absolute filename of an executable program
-installed somewhere in your PATH, or just check for its existence. It
-includes the command-line utility 'pwhich' which has the same function
-as 'which'.
+installed somewhere in your PATH, or just check for its existence.
 
 %prep
 %setup -q -n File-Which-%{version}
@@ -42,25 +37,24 @@ perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w %{buildroot}/*
+chmod -R u+w %{buildroot}
 
 %check
-%if !%{defined perl_bootstrap}
 make test
-%endif
 
 %files
 %doc Changes README
-# %%{_bindir}/pwhich
 %{perl_vendorlib}/File/
-# %%{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3pm*
-
+%{_mandir}/man3/File::Which.3*
 
 %changelog
+* Mon Jun 15 2015 Paul Howarth <paul@city-fan.org> - 1.18-4
+- No longer needs any non-core buildreqs, and hence bootstrapping
+- Drop references to pwhich, which is no longer included
+- This release by PLICEASE → update source URL
+
 * Wed Jun 10 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.18-3
 - Perl 5.22 re-rebuild of bootstrapped packages