diff --git a/perl-Snowball-Swedish.spec b/perl-Snowball-Swedish.spec
index 4063b99..23bb26a 100644
--- a/perl-Snowball-Swedish.spec
+++ b/perl-Snowball-Swedish.spec
@@ -1,17 +1,27 @@
 Name:           perl-Snowball-Swedish
 Version:        1.2
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Porter's stemming algorithm for Swedish
 License:        GPLv2 or Artistic
-Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Snowball-Swedish/
 Source0:        http://www.cpan.org/authors/id/A/AS/ASKSH/Snowball-Swedish-%{version}.tar.gz
 BuildArch:      noarch
+# Build
+BuildRequires:  coreutils
+BuildRequires:  perl
 BuildRequires:  perl(Module::Build)
+BuildRequires:  perl(strict)
+BuildRequires:  perl(warnings)
+# Runtime
+BuildRequires:  perl(bytes)
+BuildRequires:  perl(vars)
+# Tests only
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(English)
+BuildRequires:  perl(FileHandle)
+BuildRequires:  perl(FindBin)
 BuildRequires:  perl(Test::More) >= 0.42
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?perl_default_filter}
+Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %description
 The stem function takes a scalar as a parameter and stems the word according to
@@ -20,30 +30,30 @@ website: http://snowball.tartarus.org/.
 
 %prep
 %setup -q -n Snowball-Swedish-%{version}
-
 mv bin/stemmer-se.pl bin/stemmer-se
 
 %build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
 ./Build
 
 %install
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+./Build install destdir=%{buildroot} create_packlist=0
+%{_fixperms} %{buildroot}/*
 
 %check
 ./Build test
 
 %files
-%defattr(-,root,root,-)
-%doc Changes LICENSE README
+%license LICENSE
+%doc Changes README
 %{perl_vendorlib}/*
 %{_bindir}/*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Mar 01 2016 Petr Šabata <contyk@redhat.com> - 1.2-17
+- Package cleanup
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild