diff --git a/perl-Net-DBus-GLib.spec b/perl-Net-DBus-GLib.spec
index 275b775..543f2f1 100644
--- a/perl-Net-DBus-GLib.spec
+++ b/perl-Net-DBus-GLib.spec
@@ -1,20 +1,35 @@
 Name:           perl-Net-DBus-GLib
 Version:        0.33.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Perl extension for the DBus GLib bindings
 License:        GPLv2+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Net-DBus-GLib/
 Source0:        http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-GLib-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+# Build
+BuildRequires:  findutils
+BuildRequires:  gcc
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl-devel
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+# Runtime
+BuildRequires:  dbus-devel
+BuildRequires:  dbus-glib-devel
 BuildRequires:  perl(Glib)
 BuildRequires:  perl(Net::DBus) >= 0.33.0
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+BuildRequires:  perl(XSLoader)
+# Tests only
 BuildRequires:  perl(Test::More)
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::Pod::Coverage)
-BuildRequires:  dbus-glib-devel
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Optional tests only
+BuildRequires:  perl(Test::Pod) >= 1.00
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.00
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
+Requires:       perl(Net::DBus) >= 0.33.0
+Requires:       perl(XSLoader)
+
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Net::DBus\\)$
 
 %description
 Net::DBus::GLib provides an extension to the Net::DBus module allowing
@@ -26,34 +41,28 @@ the usual Net::DBus module. That's it - every other API remains the same.
 %setup -q -n Net-DBus-GLib-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" 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' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name '*.bs' -size 0 -delete
+%{_fixperms} %{buildroot}/*
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE README examples/
+%license LICENSE
+%doc AUTHORS CHANGES README examples/
 %{perl_vendorarch}/auto/*
 %{perl_vendorarch}/Net*
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 29 2016 Petr Šabata <contyk@redhat.com> - 0.33.0-21
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.33.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild