diff --git a/Math-Base36-0.14-Fix-building-on-Perl-without-dot-in-INC.patch b/Math-Base36-0.14-Fix-building-on-Perl-without-dot-in-INC.patch
deleted file mode 100644
index d314bde..0000000
--- a/Math-Base36-0.14-Fix-building-on-Perl-without-dot-in-INC.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up Math-Base36-0.14/Makefile.PL.orig Math-Base36-0.14/Makefile.PL
---- Math-Base36-0.14/Makefile.PL.orig	2017-05-17 13:37:28.574935384 +0200
-+++ Math-Base36-0.14/Makefile.PL	2017-05-17 13:38:24.641720026 +0200
-@@ -1,3 +1,5 @@
-+BEGIN { push @INC, '.'; }
-+
- use inc::Module::Install 1.00;
- 
- if ( -e 'MANIFEST.SKIP' ) {
diff --git a/perl-Math-Base36.spec b/perl-Math-Base36.spec
index 3e7cbe9..2beec9e 100644
--- a/perl-Math-Base36.spec
+++ b/perl-Math-Base36.spec
@@ -1,37 +1,37 @@
+# Perform optional tests
+%bcond_without perl_Math_Base36_enables_optional_test
+
 Name:           perl-Math-Base36
 Version:        0.14
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Encoding and decoding of base36 strings
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/Math-Base36
 Source0:        https://cpan.metacpan.org/authors/id/B/BR/BRICAS/Math-Base36-%{version}.tar.gz
-Patch0:         Math-Base36-0.14-Fix-building-on-Perl-without-dot-in-INC.patch
 BuildArch:      noarch
 # Build
+BuildRequires:  coreutils
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
-BuildRequires:  perl(Config)
-BuildRequires:  perl(Cwd)
-BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
-BuildRequires:  perl(ExtUtils::MM_Unix)
-BuildRequires:  perl(Fcntl)
-BuildRequires:  perl(File::Find)
-BuildRequires:  perl(File::Path)
-BuildRequires:  perl(strict)
-BuildRequires:  perl(vars)
+BuildRequires:  perl-interpreter
+BuildRequires:  perl(inc::Module::Install) >= 1.00
+BuildRequires:  perl(Module::Install::Metadata)
+BuildRequires:  perl(Module::Install::WriteAll)
 # Runtime
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Exporter)
 BuildRequires:  perl(Math::BigInt)
+BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
 # Tests only
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More)
+%if %{with perl_Math_Base36_enables_optional_test}
 # Optional tests only
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.00
+%endif
 Requires:       perl(:MODULE_COMPAT_%(eval "$(perl -V:version)"; echo $version))
 
 %{?perl_default_filter}
@@ -41,14 +41,16 @@ This module converts to and from Base36 numbers (0..9 - A..Z).
 
 %prep
 %setup -q -n Math-Base36-%{version}
-%patch0 -p1
+# Remove bundled modules
+rm -rf inc
+perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
+%{make_build}
 
 %install
-make pure_install DESTDIR=%{buildroot}
+%{make_install}
 %{_fixperms} %{buildroot}/*
 
 %check
@@ -60,6 +62,9 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri Mar 06 2020 Petr Pisar <ppisar@redhat.com> - 0.14-16
+- Unbundle Module::Install
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild