diff --git a/CPAN-Meta-YAML-0.004-old-EU::MM.patch b/CPAN-Meta-YAML-0.004-old-EU::MM.patch
deleted file mode 100644
index a60208e..0000000
--- a/CPAN-Meta-YAML-0.004-old-EU::MM.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CPAN-Meta-YAML/Makefile.PL
-+++ CPAN-Meta-YAML/Makefile.PL
-@@ -4,7 +4,7 @@
- 
- use 5.004;
- 
--use ExtUtils::MakeMaker 6.30;
-+use ExtUtils::MakeMaker;
- 
- 
- 
diff --git a/CPAN-Meta-YAML-0.004-old-Test::More.patch b/CPAN-Meta-YAML-0.004-old-Test::More.patch
deleted file mode 100644
index 0922d4f..0000000
--- a/CPAN-Meta-YAML-0.004-old-Test::More.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- CPAN-Meta-YAML-0.004/xt/release/test-version.t.orig	2011-09-06 14:42:59.000000000 +0100
-+++ CPAN-Meta-YAML-0.004/xt/release/test-version.t	2011-09-07 13:22:05.882101877 +0100
-@@ -8,5 +8,6 @@
- plan skip_all => "Test::Version 0.04 required for testing versions"
-     if $@;
- 
-+plan tests => 1;
-+
- version_all_ok();
--done_testing;
diff --git a/CPAN-Meta-YAML-0.006-old-Test::More.patch b/CPAN-Meta-YAML-0.006-old-Test::More.patch
new file mode 100644
index 0000000..37fb2d6
--- /dev/null
+++ b/CPAN-Meta-YAML-0.006-old-Test::More.patch
@@ -0,0 +1,10 @@
+diff -up CPAN-Meta-YAML-0.006/xt/release/test-version.t.orig CPAN-Meta-YAML-0.006/xt/release/test-version.t
+--- CPAN-Meta-YAML-0.006/xt/release/test-version.t.orig	2012-02-07 01:51:53.000000000 +0000
++++ CPAN-Meta-YAML-0.006/xt/release/test-version.t	2012-02-07 11:48:13.912695104 +0000
+@@ -8,5 +8,5 @@ use Test::Requires {
+     'Test::Version' => 0.04,
+ };
+ 
++plan tests => 2;
+ version_all_ok;
+-done_testing;
diff --git a/perl-CPAN-Meta-YAML.spec b/perl-CPAN-Meta-YAML.spec
index af05a30..ab9a2ca 100644
--- a/perl-CPAN-Meta-YAML.spec
+++ b/perl-CPAN-Meta-YAML.spec
@@ -1,28 +1,28 @@
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%global old_eumm %(perl -MExtUtils::MakeMaker -e 'print (($ExtUtils::MakeMaker::VERSION < 6.30) ? 1 : 0);' 2>/dev/null || echo 0)
-
 # We need to patch the test suite if we have Test::More < 0.88
 %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
 
 Name:		perl-CPAN-Meta-YAML
-Version:	0.005
-Release:	2%{?dist}
+Version:	0.006
+Release:	1%{?dist}
 Summary:	Read and write a subset of YAML for CPAN Meta files
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		http://search.cpan.org/dist/CPAN-Meta-YAML/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DA/DAGOLDEN/CPAN-Meta-YAML-%{version}.tar.gz
-Patch0:		CPAN-Meta-YAML-0.004-old-EU::MM.patch
-Patch1:		CPAN-Meta-YAML-0.004-old-Test::More.patch
+Patch1:		CPAN-Meta-YAML-0.006-old-Test::More.patch
 Patch2:		CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(File::Spec)
+# Version 1.113620 needed for "UTF"
+BuildRequires:	perl(Pod::Wordlist::hanekomu) >= 1.113620
 BuildRequires:	perl(Test::CPAN::Meta)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Test::Pod)
-# RHEL <= 6 doesn't have a recent enough perl(version) for perl(Test::Version)
+BuildRequires:	perl(Test::Requires)
+BuildRequires:	perl(Test::Spelling), aspell-en
+# RHEL ≤ 6 doesn't have a recent enough perl(version) for perl(Test::Version)
 %if 0%{?fedora} || 0%{?rhel} > 6
 BuildRequires:	perl(Test::Version)
 %endif
@@ -37,11 +37,6 @@ used for any other general YAML parsing or generation task.
 %prep
 %setup -q -n CPAN-Meta-YAML-%{version}
 
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%if %{old_eumm}
-%patch0 -p1
-%endif
-
 # We need to patch the test suite if we have Test::More < 0.88
 %if %{old_test_more}
 %patch1 -p1
@@ -68,12 +63,24 @@ make test TEST_FILES="t/*.t xt/*/*.t"
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/CPAN/
 %{_mandir}/man3/CPAN::Meta::YAML.3pm*
 
 %changelog
+* Tue Feb  7 2012 Paul Howarth <paul@city-fan.org> - 0.006-1
+- Update to 0.006:
+  - Set back configure_requires prerequisite for ExtUtils::MakeMaker
+    from 6.30 to 6.17
+- BR: perl(Test::Requires)
+- BR: perl(Test::Spelling), perl(Pod::Wordlist::hanekomu) and aspell-en to
+  enable the spell checker test
+- Drop patch for building with old ExtUtils::MakeMaker versions, no longer
+  needed
+- Drop support for soon-to-be-EOL RHEL-4:
+  - Drop %%defattr, redundant since rpm 4.4
+- Update patch for building with Test::More < 0.88
+
 * Tue Jan 10 2012 Paul Howarth <paul@city-fan.org> - 0.005-2
 - Fedora 17 mass rebuild
 
diff --git a/sources b/sources
index 855a1f2..a7a0866 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b006f77a16aac0c471ed17c52e1ca648  CPAN-Meta-YAML-0.005.tar.gz
+864db5c6f6746493ce1ab27b83a3b4b9  CPAN-Meta-YAML-0.006.tar.gz