diff --git a/perl-Class-MethodMaker.spec b/perl-Class-MethodMaker.spec
index 7182371..14ef428 100644
--- a/perl-Class-MethodMaker.spec
+++ b/perl-Class-MethodMaker.spec
@@ -1,16 +1,18 @@
 Name:           perl-Class-MethodMaker
 Version:        2.24
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Perl module for creating generic object-oriented methods
 
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/~schwigon/Class-MethodMaker/
 Source0:        http://www.cpan.org/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-%{version}.tar.gz
 
+BuildRequires:  coreutils
 BuildRequires:  findutils
+BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  perl
+BuildRequires:  perl-devel
 BuildRequires:  perl(Config)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -53,11 +55,12 @@ BuildRequires:  perl(Tie::StdHash)
 BuildRequires:  perl(Tie::StdScalar)
 BuildRequires:  perl(vars)
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:  perl(B::Deparse)
 Requires:  perl(Data::Dumper)
 
 %{?perl_default_filter}
+
 # Remove under-specified dependencies
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(AutoLoader\\)$
 
@@ -69,14 +72,14 @@ methods for your objects that perform standard tasks.
 %setup -q -n Class-MethodMaker-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
-%{_fixperms} $RPM_BUILD_ROOT
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
+find %{buildroot} -type f -name '*.bs' -empty -delete
+%{_fixperms} %{buildroot}
 
 %check
 make test
@@ -94,8 +97,13 @@ make test
 %{_mandir}/man3/Class::MethodMaker::hash.3*
 %{_mandir}/man3/Class::MethodMaker::scalar.3*
 
-
 %changelog
+* Thu Apr 21 2016 Paul Howarth <paul@city-fan.org> - 2.24-5
+- Fix FTBFS due to missing buildreq perl-devel
+- Simplify find commands using -delete
+- Don't use macros for commands
+- Drop redundant Group: tag
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.24-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild