diff --git a/perl-MP3-Info.spec b/perl-MP3-Info.spec
index caf3ebc..d156a96 100644
--- a/perl-MP3-Info.spec
+++ b/perl-MP3-Info.spec
@@ -1,57 +1,67 @@
 Name:           perl-MP3-Info
 Version:        1.24
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Manipulate / fetch info from MP3 audio files
-
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/MP3-Info
 Source0:        http://www.cpan.org/modules/by-module/MP3/MP3-Info-%{version}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires:  perl(ExtUtils::MakeMaker) perl(Test::More)
-
+# Build
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(Config)
+BuildRequires:  perl(CPAN)
+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(bytes)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(Encode::Detect::Detector)
+BuildRequires:  perl(Encode::Guess)
+BuildRequires:  perl(overload)
+# Tests only
+BuildRequires:  perl(File::Copy)
+BuildRequires:  perl(File::Spec::Functions)
+BuildRequires:  perl(Test::More)
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
+Recommends:     perl(Encode)
+Recommends:     perl(Encode::Detect::Detector)
+Recommends:     perl(Encode::Guess)
 
 %description
 This module is used for getting info out of and into MP3 files.
 
-
 %prep
 %setup -qn MP3-Info-%{version}
 
-
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
+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 -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+make pure_install DESTDIR=%{buildroot}
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README eg
 %{perl_vendorlib}/*
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Mon Feb 29 2016 Petr Šabata <contyk@redhat.com> - 1.24-18
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.24-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild