diff --git a/perl-Module-Install.spec b/perl-Module-Install.spec
index 7f0d2e0..0dc654f 100644
--- a/perl-Module-Install.spec
+++ b/perl-Module-Install.spec
@@ -1,27 +1,32 @@
 Name:           perl-Module-Install
 Version:        1.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Standalone, extensible Perl module installer
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Module-Install/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Module-Install-%{version}.tar.gz
 BuildArch:      noarch
-
-# Note, Makefile.PL is going to complain about having lower versions of
-# certain modules than is supported. (Especially under F-10.) However, 
-# all tests pass and AFAICT everything works just fine in normal usage.
-
 BuildRequires:  perl(Archive::Tar) >= 1.44
+BuildRequires:  perl(Carp)
 BuildRequires:  perl(CPAN)
+BuildRequires:  perl(CPANPLUS::Backend)
+BuildRequires:  perl(Cwd)
 BuildRequires:  perl(Devel::PPPort) >= 3.16
 BuildRequires:  perl(ExtUtils::Install) >= 1.52
 BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::Manifest)
+BuildRequires:  perl(ExtUtils::MM)
 BuildRequires:  perl(ExtUtils::ParseXS) >= 2.19
 BuildRequires:  perl(File::Remove) >= 1.42
+BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::Spec) >= 3.28
+BuildRequires:  perl(File::Temp)
+BuildRequires:  perl(inc::Module::Install)
 BuildRequires:  perl(JSON) >= 2.14
+BuildRequires:  perl(lib)
 BuildRequires:  perl(LWP::UserAgent) >= 5.812
+BuildRequires:  perl(Module::AutoInstall)
 BuildRequires:  perl(Module::Build) >= 0.29
 BuildRequires:  perl(Module::CoreList) >= 2.17
 BuildRequires:  perl(Module::ScanDeps) >= 0.89
@@ -33,7 +38,6 @@ BuildRequires:  perl(Test::MinimumVersion)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod)
 BuildRequires:  perl(YAML::Tiny) >= 1.38
-Requires:       perl(Archive::Tar)
 Requires:       perl(Carp)
 Requires:       perl(CPAN)
 Requires:       perl(CPANPLUS::Backend)
@@ -41,7 +45,7 @@ Requires:       perl(ExtUtils::ParseXS)
 Requires:       perl(Module::Build)
 Requires:       perl(Module::ScanDeps)
 Requires:       perl(PAR::Dist) >= 0.29
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 Module::Install is a package for writing installers for CPAN (or CPAN-like)
@@ -51,19 +55,17 @@ version 5.005 or newer.
 
 %prep
 %setup -q -n Module-Install-%{version}
+rm -rf inc
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-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 \;
-rm -rf $RPM_BUILD_ROOT/blib/lib/auto/share/dist/Module-Install/dist_file.txt
-%{_fixperms} $RPM_BUILD_ROOT/*
-find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -perm +100 -exec chmod a-x {} \;
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+rm -rf %{buildroot}/blib/lib/auto/share/dist/Module-Install/dist_file.txt
+%{_fixperms} %{buildroot}/*
 
 %check
 make test AUTOMATED_TESTING=1
@@ -74,6 +76,11 @@ make test AUTOMATED_TESTING=1
 %{_mandir}/man3/*
 
 %changelog
+* Tue Nov 20 2012 Petr Šabata <contyk@redhat.com> - 1.06-2
+- Add missing deps
+- Unbundle Module::Install
+- Modernize the spec
+
 * Fri Oct 05 2012 Petr Šabata <contyk@redhat.com> - 1.06-1
 - 1.06 bump