diff --git a/perl-Class-C3-Componentised.spec b/perl-Class-C3-Componentised.spec
index ac2b77f..5b1f229 100644
--- a/perl-Class-C3-Componentised.spec
+++ b/perl-Class-C3-Componentised.spec
@@ -1,6 +1,6 @@
 Name:           perl-Class-C3-Componentised
 Version:        1.001000
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Load mix-ins or components to your C3-based class
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -9,17 +9,31 @@ Source0:        http://search.cpan.org/CPAN/authors/id/F/FR/FREW/Class-C3-Compon
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+BuildRequires: coreutils
+BuildRequires: findutils
+BuildRequires: make
+BuildRequires: perl
 BuildRequires: perl-generators
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.42
-BuildRequires: perl(Test::More)
+BuildRequires: perl(inc::Module::Install)
+BuildRequires: perl(Module::Install::Metadata)
+BuildRequires: perl(Module::Install::WriteAll)
+BuildRequires: sed
+# Run-time
 BuildRequires: perl(Carp)
 BuildRequires: perl(Class::C3) >= 0.20
 BuildRequires: perl(Class::Inspector)
+BuildRequires: perl(List::Util)
 BuildRequires: perl(MRO::Compat)
-# testing
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
+# Tests
+BuildRequires: perl(base)
+BuildRequires: perl(FindBin)
+BuildRequires: perl(lib)
 BuildRequires: perl(Test::Exception)
-BuildRequires: perl(Test::Pod)
-BuildRequires: perl(Test::Pod::Coverage)
+BuildRequires: perl(Test::More)
+BuildRequires: perl(Test::Pod) >= 1.14
+BuildRequires: perl(Test::Pod::Coverage) >= 1.04
 
 Requires:       perl(Class::C3) >= 0.20
 Requires:       perl(Class::Inspector)
@@ -37,6 +51,11 @@ MooseX::Object::Pluggable.
 
 %prep
 %setup -q -n Class-C3-Componentised-%{version}
+
+# Remove bundled libraries
+rm -r inc
+sed -i -e '/^inc\// d' MANIFEST
+
 perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 
 %build
@@ -44,11 +63,8 @@ perl -pi -e 's|^#!perl|#!%{__perl}|' t/*.t
 make %{?_smp_mflags}
 
 %install
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
-
-find %{buildroot} -type f -name .packlist -exec rm -f {} +
-find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
 %{_fixperms} %{buildroot}/*
 
 %check
@@ -60,6 +76,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Tue May 16 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.001000-15
+- Fix building on Perl without '.' in @INC
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.001000-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild