diff --git a/.gitignore b/.gitignore
index 5df6ac6..fbd0758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-HTML-Tagset-3.20.tar.gz
+/HTML-Tagset-[0-9.]*.tar.gz
diff --git a/perl-HTML-Tagset.spec b/perl-HTML-Tagset.spec
index 5bf5dd2..6aa0457 100644
--- a/perl-HTML-Tagset.spec
+++ b/perl-HTML-Tagset.spec
@@ -1,52 +1,59 @@
 Name:           perl-HTML-Tagset
 Version:        3.20
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        HTML::Tagset - data tables useful in parsing HTML
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/HTML-Tagset/
 Source0:        http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
-BuildRequires:  perl(ExtUtils::MakeMaker), perl(Test::Pod)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Test::More)
+# Test::Pod -> Pod::Simple -> HTML::Entities (HTML::Parser) -> HTML::Tagset
+%if 0%{!?perl_bootstrap:1}
+BuildRequires:  perl(Test::Pod)
+%endif
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %description
 This module contains several data tables useful in various kinds of
 HTML parsing operations, such as tag and entity names.
 
-
 %prep
 %setup -q -n HTML-Tagset-%{version}
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-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 {} ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
+%{_fixperms} %{buildroot}
 
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/HTML/
 %{_mandir}/man3/HTML::Tagset.3pm*
 
-
 %changelog
+* Fri Jan 20 2012 Paul Howarth <paul@city-fan.org> - 3.20-10
+- Clean up spec file for modern rpmbuild:
+  - Drop BuildRoot definition
+  - Drop %%defattr
+  - Drop %%clean section
+  - Drop cleaning of buildroot in %%install
+  - Use DESTDIR rather than PERL_INSTALL_ROOT
+  - Use %%{_fixperms} macro rather than our own chmod incantation
+  - Don't use macros for commands
+- Break build dependency loop by only using perl(Test::Pod) if we're not
+  bootstrapping
+- BR: perl(Test::More)
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.20-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -57,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Fri Dec 17 2010 Marcela Maslanova <mmaslano@redhat.com> - 3.20-6
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Sun May 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 3.20-5
 - Mass rebuild with perl-5.12.0