diff --git a/.cvsignore b/.cvsignore
index 0c5d423..c09ad79 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-File-Find-Rule-Perl-1.04.tar.gz
+File-Find-Rule-Perl-1.06.tar.gz
diff --git a/File-Find-Rule-Perl-1.04.diff b/File-Find-Rule-Perl-1.04.diff
deleted file mode 100644
index 5f09483..0000000
--- a/File-Find-Rule-Perl-1.04.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur File-Find-Rule-Perl-1.04.orig/META.yml File-Find-Rule-Perl-1.04/META.yml
---- File-Find-Rule-Perl-1.04.orig/META.yml	2008-05-14 12:28:07.000000000 +0200
-+++ File-Find-Rule-Perl-1.04/META.yml	2009-02-27 08:27:07.000000000 +0100
-@@ -19,5 +19,5 @@
-     - t
- requires:
-   File::Find::Rule: 0.20
--  perl: 5.005
-+  perl: 5.00503
- version: 1.04
diff --git a/perl-File-Find-Rule-Perl.spec b/perl-File-Find-Rule-Perl.spec
index d5f6b55..5826f50 100644
--- a/perl-File-Find-Rule-Perl.spec
+++ b/perl-File-Find-Rule-Perl.spec
@@ -1,13 +1,11 @@
 Name:		perl-File-Find-Rule-Perl
-Version:	1.04
-Release:	4%{?dist}
+Version:	1.06
+Release:	1%{?dist}
 Summary:	Common rules for searching for Perl things
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/File-Find-Rule-Perl/
 Source0:	http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/File-Find-Rule-Perl-%{version}.tar.gz
-# META.yml has wrong minimum perl version
-Patch0:		File-Find-Rule-Perl-1.04.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -16,26 +14,33 @@ BuildArch:	noarch
 BuildRequires:	perl(File::Find::Rule) >= 0.20
 BuildRequires:	perl(File::Spec) >= 0.82
 BuildRequires:	perl(Test::More) >= 0.47
+BuildRequires:  perl(Params::Util) >= 0.38
+BuildRequires:  perl(Parse::CPAN::Meta) >= 0.04
 
 # For improved tests
-BuildRequires:	perl(Test::Pod) >= 1.00
-BuildRequires:  perl(Test::MinimumVersion) >= 0.007
-BuildRequires:  perl(Test::CPAN::Meta) >= 0.07
+BuildRequires:  perl(Perl::MinimumVersion) >= 1.20
+BuildRequires:  perl(Test::MinimumVersion) >= 0.008
+BuildRequires:  perl(Test::Pod) >= 1.26
+BuildRequires:  perl(Test::CPAN::Meta) >= 0.12
 
 %description
 Common rules for searching for Perl things.
 
 %prep
-%setup -q -n File-Find-Rule-Perl-%{version}
-%patch0 -p1
+%setup -q -T -c
+%setup -q -T -D -a0
 
 %build
+cd File-Find-Rule-Perl-%{version}
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
+cd File-Find-Rule-Perl-%{version}
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+cd ..
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
@@ -44,15 +49,22 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 rm -rf $RPM_BUILD_ROOT
 
 %check
+cd File-Find-Rule-Perl-%{version}
 make test AUTOMATED_TESTING=1
+cd ..
 
 %files
 %defattr(-,root,root,-)
-%doc Changes LICENSE
+%doc File-Find-Rule-Perl-%{version}/Changes File-Find-Rule-Perl-%{version}/LICENSE
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jun 17 2009 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.06-1
+- Upsteam update.
+- Build in subdir to work-around rpm disturbing testsuite.
+- Rework BRs.
+
 * Fri Feb 27 2009 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.04-4
 - Adjust minimum perl version in META.yml (Add File-Find-Rule-Perl-1.04.diff).
 
diff --git a/sources b/sources
index b8428b0..49819cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab66b7829320ead71ee0b09e13726d26  File-Find-Rule-Perl-1.04.tar.gz
+6203f16bed4d0740a7fcc5515ad965a0  File-Find-Rule-Perl-1.06.tar.gz