diff --git a/perl-CPANPLUS.spec b/perl-CPANPLUS.spec
index 9297a5d..d9cc0a5 100644
--- a/perl-CPANPLUS.spec
+++ b/perl-CPANPLUS.spec
@@ -2,7 +2,7 @@
 Name:           perl-CPANPLUS
 # Keep 2-digit major varion to compete with perl.spec for history
 Version:        %(echo '%{cpan_version}' | sed 's/\(\...\)/\1./')
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ameliorated interface to the Comprehensive Perl Archive Network
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -15,7 +15,15 @@ BuildRequires:  perl(File::Copy)
 BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(Getopt::Long)
+%if %{defined perl_bootstrap}
+BuildRequires:  perl(ExtUtils::MakeMaker)
+# ExtUtils::Manifest not used
+BuildRequires:  perl(ExtUtils::MM_Unix)
+# Module::Build not used
+# YAML not used
+%else
 BuildRequires:  perl(inc::Module::Install)
+%endif
 BuildRequires:  perl(lib)
 BuildRequires:  perl(Locale::Maketext::Simple)
 BuildRequires:  perl(Module::Loaded)
@@ -75,8 +83,13 @@ interactive shells, command line programs, etc., that use this API.
 %prep
 %setup -q -n CPANPLUS-%{cpan_version}
 # Remove bundled modules
+%if !%{defined perl_bootstrap}
 rm -rf inc
 sed -i -e '/^inc\//d' MANIFEST
+%else
+rm -rf inc/bundle
+sed -i -e '/^inc\/bundle\//d' MANIFEST
+%endif
 # Fix shebangs
 sed -i -e '1i#!%{__perl}' bin/cpanp-run-perl
 
@@ -100,5 +113,8 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 04 2013 Petr Pisar <ppisar@redhat.com> - 0.91.34-2
+- Keep bundled inc::Module::Install modules at boot-strap (bug #947489)
+
 * Thu Jan 24 2013 Petr Pisar <ppisar@redhat.com> 0.91.34-1
 - Specfile autogenerated by cpanspec 1.78.