diff --git a/.gitignore b/.gitignore
index 24fb515..9a2618c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /constant-defer-5.tar.gz
+/constant-defer-6.tar.gz
diff --git a/perl-constant-defer.spec b/perl-constant-defer.spec
index e533106..f687cf2 100644
--- a/perl-constant-defer.spec
+++ b/perl-constant-defer.spec
@@ -1,27 +1,30 @@
 Name:           perl-constant-defer
-Version:        5
-Release:        8%{?dist}
+Version:        6
+Release:        1%{?dist}
 Summary:        Constant subs with deferred value calculation
 License:        GPLv3+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/constant-defer/
 Source0:        http://www.cpan.org/authors/id/K/KR/KRYDE/constant-defer-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  perl
 # The inc/my_pod2html is not called
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(lib)
+BuildRequires:  perl(strict)
 # Run-Time:
 BuildRequires:  perl(Carp)
+BuildRequires:  perl(vars)
 # Tests:
-BuildRequires:  perl(Devel::FindRef)
+# Devel::FindRef not used
 BuildRequires:  perl(Exporter)
+BuildRequires:  perl(lib)
 BuildRequires:  perl(Scalar::Util)
 BuildRequires:  perl(Test)
-BuildRequires:  perl(Test::More)
 # Optionals tests:
 BuildRequires:  perl(Data::Dumper)
-BuildRequires:  perl(Devel::StackTrace)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# Devel::StackTrace not used
+# Test::More not used
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
 
 %description
@@ -35,24 +38,27 @@ allowing it to be garbage collected.
 chmod -x examples/*
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+make pure_install DESTDIR=$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/*
 
 %check
 make test
 
 %files
-%doc Changes COPYING examples README
+%license COPYING
+%doc Changes examples README
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
 %changelog
+* Fri Feb 20 2015 Petr Pisar <ppisar@redhat.com> - 6-1
+- Version 6 bump
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 5-8
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index 89e633c..f51ec56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-519232b64896395b84b41f5300d1cab3  constant-defer-5.tar.gz
+6af9912fa420340e9e171ac81f450492  constant-defer-6.tar.gz