diff --git a/perl-Kwiki-Diff.spec b/perl-Kwiki-Diff.spec
index 524ebe2..39909f7 100644
--- a/perl-Kwiki-Diff.spec
+++ b/perl-Kwiki-Diff.spec
@@ -1,63 +1,60 @@
 Name:           perl-Kwiki-Diff
 Version:        0.03
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        Display differences between the current wiki page and older revisions
 License:        GPL+ or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Kwiki-Diff/
 Source0:        http://www.cpan.org/authors/id/I/IA/IAN/Kwiki-Diff-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+# Build
+BuildRequires:  make
+BuildRequires:  perl
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Runtime
 BuildRequires:  perl(Algorithm::Diff) >= 1.18
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(IO::All)
-BuildRequires:  perl(Kwiki) >= 0.34
-BuildRequires:  perl(Kwiki::Revisions) >= 0.12
-BuildRequires:  perl(Spiffy) >= 0.22
+BuildRequires:  perl(Kwiki::CGI)
+BuildRequires:  perl(Kwiki::Installer)
+BuildRequires:  perl(Kwiki::Plugin)
+# Tests only
+BuildRequires:  perl(lib)
 BuildRequires:  perl(Test::More)
-# For improved tests
-BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
+# Optional tsts only
 BuildRequires:  perl(Test::Pod) >= 1.14
+BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 Requires:       perl(Algorithm::Diff) >= 1.18
 Requires:       perl(Kwiki) >= 0.34
-Requires:       perl(Kwiki::Revisions) >= 0.12
-Requires:       perl(Spiffy) >= 0.22
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Enhances:       perl(Kwiki::Revisions)
 
 %description
-Kwiki Diff plugin.
+%{summary}.
 
 %prep
 %setup -q -n Kwiki-Diff-%{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
-rm -f debug*.list
+rm -f SIGNATURE
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Wed Feb 10 2016 Petr Šabata <contyk@redhat.com> - 0.03-28
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.03-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild