diff --git a/perl-File-HomeDir.spec b/perl-File-HomeDir.spec
index af6f3bf..3203372 100644
--- a/perl-File-HomeDir.spec
+++ b/perl-File-HomeDir.spec
@@ -1,27 +1,26 @@
 Name:           perl-File-HomeDir
 Version:        1.00
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Find your home and other directories on any platform
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/File-HomeDir/
 Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/File-HomeDir-%{version}.tar.gz
-
 BuildArch:      noarch
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Cwd) >= 3.12
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.42
 BuildRequires:  perl(File::Path) >= 2.01
 BuildRequires:  perl(File::Spec) >= 3.12
+BuilDrequires:  perl(File::Spec::Functions)
 BuildRequires:  perl(File::Temp) >= 0.19
 BuildRequires:  perl(File::Which) >= 0.05
+BuildRequires:  perl(inc::Module::Install)
 %if !%{defined perl_bootstrap}
-BuildRequires:  perl(Test::Pod)
-BuildRequires:  perl(Test::MinimumVersion)
 BuildRequires:  perl(Test::More) >= 0.47
 %endif
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Cwd) >= 3.12
 Requires:       perl(File::Path) >= 2.01
 Requires:       perl(File::Spec) >= 3.12
@@ -29,7 +28,7 @@ Requires:       perl(File::Temp) >= 0.19
 Requires:       perl(File::Which) >= 0.05
 
 %{?perl_default_filter}
-%global __requires_exclude %{?__requires_exclude}|perl\\(Cwd\\)|perl\\(File::Path\\)|perl\\(File::Spec\\)|perl\\(File::Temp\\)|perl\\(File::Which\\)|perl\\(Mac::
+%global __requires_exclude %{?__requires_exclude}|perl\\(Cwd\\)|perl\\(File::Path\\)|perl\\(File::Spec\\)|perl\\(File::Temp\\)|perl\\(File::Which\\)|perl\\(Mac::|perl\\(Win32
 
 %description
 File::HomeDir is a module for locating the directories that are "owned"
@@ -37,36 +36,33 @@ by a user (typically your user) and to solve the various issues that
 arise trying to find them consistently across a wide variety of
 platforms.
 
-
 %prep
 %setup -q -n File-HomeDir-%{version}
-
+rm -rf inc
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
-
 %install
-make pure_install PERL_INSTALL_ROOT=$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 ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+chmod -R u+w %{buildroot}/*
 
 %check
-# These tests don't do anything really useful. Also, they are broken.
-# AUTOMATED_TESTING=1 make test
-
-
+make test
 
 %files
 %doc Changes LICENSE README
 %{perl_vendorlib}/File/
 %{_mandir}/man3/*.3pm*
 
-
 %changelog
+* Mon Nov 26 2012 Petr Šabata <contyk@redhat.com> - 1.00-2
+- Re-enable the test suite
+- Unbundle inc::Module::Install
+- Modernize the spec
+
 * Mon Oct 22 2012 Tom Callaway <spot@fedoraproject.org> - 1.00-1
 - update to 1.00