diff --git a/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch b/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
deleted file mode 100644
index dd5b410..0000000
--- a/CPAN-Meta-YAML-0.004-old-Scalar::Util.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This bug inherited from YAML::Tiny 1.50, which I'd forgotten to report upstream.
-
---- CPAN-Meta-YAML-0.004/lib/CPAN/Meta/YAML.pm
-+++ CPAN-Meta-YAML-0.004/lib/CPAN/Meta/YAML.pm
-@@ -615,7 +615,7 @@
- 		require Scalar::Util;
- 	};
- 	if ( $@ or $Scalar::Util::VERSION < 1.18 ) {
--		eval <<'END_PERL' if $@;
-+		eval <<'END_PERL';
- # Scalar::Util failed to load or too old
- sub refaddr {
- 	my $pkg = ref($_[0]) or return undef;
diff --git a/perl-CPAN-Meta-YAML.spec b/perl-CPAN-Meta-YAML.spec
index be75de1..6bad625 100644
--- a/perl-CPAN-Meta-YAML.spec
+++ b/perl-CPAN-Meta-YAML.spec
@@ -2,7 +2,7 @@
 %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.007
+Version:	0.008
 Release:	1%{?dist}
 Summary:	Read and write a subset of YAML for CPAN Meta files
 License:	GPL+ or Artistic
@@ -10,7 +10,6 @@ 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
 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)
@@ -42,9 +41,6 @@ used for any other general YAML parsing or generation task.
 %patch1 -p1
 %endif
 
-# Fix operation with Scalar::Util < 1.18 properly (CPAN RT#53490)
-%patch2 -p1
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -53,7 +49,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
 %{_fixperms} %{buildroot}
 
 %check
@@ -68,6 +63,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/CPAN::Meta::YAML.3pm*
 
 %changelog
+* Thu Mar 15 2012 Paul Howarth <paul@city-fan.org> - 0.008-1
+- Update to 0.008:
+  - Generated from ADAMK/YAML-Tiny-1.51.tar.gz
+  - Updated from YAML-Tiny to fix compatibility with older Scalar::Util
+- Drop upstreamed patch for old Scalar::Util versions
+- Don't need to remove empty directories from the buildroot
+
 * Wed Feb  8 2012 Paul Howarth <paul@city-fan.org> - 0.007-1
 - Update to 0.007:
   - Documentation fix to replace missing abstract
diff --git a/sources b/sources
index e20ea18..0201fa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f53068231e0f19d5f49af06732bb9bcc  CPAN-Meta-YAML-0.007.tar.gz
+06211d8492f23c68aadb83670451284d  CPAN-Meta-YAML-0.008.tar.gz