diff --git a/perl-XML-NamespaceSupport.spec b/perl-XML-NamespaceSupport.spec
index 03212e5..c93f4c7 100644
--- a/perl-XML-NamespaceSupport.spec
+++ b/perl-XML-NamespaceSupport.spec
@@ -1,21 +1,31 @@
 Name:           perl-XML-NamespaceSupport
 Version:        1.11
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A simple generic namespace support class
 
-Group:          Development/Libraries
 License:        GPL+ or Artistic
 Url:            http://search.cpan.org/dist/XML-NamespaceSupport/
 Source0:        http://www.cpan.org/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(constant)
+BuildRequires:  coreutils
+BuildRequires:  findutils
+BuildRequires:  make
+BuildRequires:  perl
 BuildRequires:  perl(Cwd)
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Path)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(vars)
+BuildRequires:  sed
+# Run-time
+BuildRequires:  perl(constant)
+BuildRequires:  perl(warnings)
+# Tests
 BuildRequires:  perl(Test::More) >= 0.47
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This module offers a simple to process namespaced XML names (unames) from
@@ -24,34 +34,28 @@ to namespace URI map, and provides a number of basic checks.
 
 %prep
 %setup -q -n XML-NamespaceSupport-%{version}
-%{__chmod} 644 lib/XML/NamespaceSupport.pm
+chmod 644 lib/XML/NamespaceSupport.pm
 
 %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 ';'
+make pure_install DESTDIR=$RPM_BUILD_ROOT
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/XML/
 %{_mandir}/man3/*.3*
 
-
 %changelog
+* Mon Feb 29 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.11-18
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild