diff --git a/perl-Image-Math-Constrain.spec b/perl-Image-Math-Constrain.spec
index 391ae61..b7983f6 100644
--- a/perl-Image-Math-Constrain.spec
+++ b/perl-Image-Math-Constrain.spec
@@ -1,19 +1,33 @@
 Name:           perl-Image-Math-Constrain
 Version:        1.02
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Scaling math used in image size constraining (such as thumbnails)
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Image-Math-Constrain/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Image-Math-Constrain-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::Pod) >= 1.26
-BuildRequires:  perl(Test::More) >= 0.47
+# Build
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(Config)
+BuildRequires:  perl(Cwd)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(ExtUtils::MM_Unix)
+BuildRequires:  perl(File::Find)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+# Runtime
+BuildRequires:  perl(overload)
+# Tests only
+BuildRequires:  perl(Pod::Simple) >= 3.07
 BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 BuildRequires:  perl(Test::MinimumVersion) >= 0.008
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::More) >= 0.47
+BuildRequires:  perl(Test::Pod) >= 1.26
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %description
 There are a number of different modules and systems that constrain image
@@ -26,32 +40,26 @@ down proportionally so that it fits within the constraints.
 %setup -q -n Image-Math-Constrain-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+%{_fixperms} %{buildroot}/*
 
 %check
 make test AUTOMATED_TESTING=1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc Changes LICENSE README
+%license LICENSE
+%doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Feb 09 2016 Petr Šabata <contyk@redhat.com> - 1.02-21
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.02-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild