diff --git a/perl-HTML-Tree.spec b/perl-HTML-Tree.spec
index f6943ca..6848619 100644
--- a/perl-HTML-Tree.spec
+++ b/perl-HTML-Tree.spec
@@ -1,7 +1,7 @@
 Name:           perl-HTML-Tree
-Version:        5.02
-Release:        3%{?dist}
 Epoch:          1
+Version:        5.02
+Release:        4%{?dist}
 Summary:        HTML tree handling modules for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -15,16 +15,16 @@ BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Pod) >= 1.00
 BuildRequires:  perl(Test::More)
-BuildRequires:	perl(Test::Fatal)
-BuildRequires:	perl(Test::LeakTrace)
+BuildRequires:  perl(Test::Fatal)
 %if !%{defined perl_bootstrap}
-BuildRequires:	perl(HTML::FormatText)
+# HTML::FormatText (perl-HTML-Format) has BR: perl(HTML::TreeBuilder) from this package
+BuildRequires:  perl(HTML::FormatText)
+# perl-Test-LeakTrace -> perl-Test-Valgrind -> perl-XML-Twig -> perl-HTML-Tree
+BuildRequires:  perl(Test::LeakTrace)
 %endif
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(HTML::Parser) >= 3.46
 Requires:       perl(HTML::Tagset) >= 3.02
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# add because of possible problems with not mathing cpan,rpm version
-Provides:       perl(HTML::Tree) = %{version}
 
 %description
 This distribution contains a suite of modules for representing,
@@ -37,14 +37,12 @@ a separate development track.
 %setup -q -n HTML-Tree-%{version}
 
 %build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
 ./Build
 
 %install
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
 
 %check
 ./Build test
@@ -56,6 +54,13 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_mandir}/man3/HTML::*3*
 
 %changelog
+* Tue Jul 17 2012 Paul Howarth <paul@city-fan.org> - 1:5.02-4
+- Don't BR: perl(Test::LeakTrace) when bootstrapping
+- Don't use macros for commands
+- Don't need to remove empty directories from the buildroot
+- Drop explicit provides for perl(HTML::Tree) now that CPAN and RPM versions
+  are back in sync
+
 * Tue Jul 10 2012 Petr Pisar <ppisar@redhat.com> - 1:5.02-3
 - Perl 5.16 re-rebuild of bootstrapped packages