diff --git a/perl-Test-Synopsis.spec b/perl-Test-Synopsis.spec
index d88c026..845358f 100644
--- a/perl-Test-Synopsis.spec
+++ b/perl-Test-Synopsis.spec
@@ -1,6 +1,6 @@
 Name:		perl-Test-Synopsis
 Version:	0.06
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Test your SYNOPSIS code
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -8,14 +8,19 @@ URL:		http://search.cpan.org/dist/Test-Synopsis/
 Source0:	http://search.cpan.org/CPAN/authors/id/M/MI/MIYAGAWA/Test-Synopsis-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
+BuildRequires:	perl(base)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(ExtUtils::Manifest)
 BuildRequires:	perl(Test::Builder::Module)
 BuildRequires:	perl(Test::Pod) >= 1.00
 # Test::Perl::Critic -> Perl::Critic -> List::MoreUtils -> Test::LeakTrace -> Test::Synopsis
-%if 0%{!?perl_bootstrap:1} && ! (0%{?rhel} >= 7)
-BuildRequires:	aspell-en
+%if 0%{!?perl_bootstrap:1}
 BuildRequires:	perl(Test::Perl::Critic)
+%endif
+# RHEL-7 package cannot have buildreqs from EPEL-7 (aspell-en), so skip the
+# spell check there; we won't need Test::Spelling either in that case
+%if 0%{?rhel} < 7
+BuildRequires:	aspell-en
 BuildRequires:	perl(Test::Spelling)
 %endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -40,7 +45,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
@@ -51,12 +55,17 @@ make test TEST_FILES="xt/*.t"
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/Test::Synopsis.3pm*
 
 %changelog
+* Thu Jun  7 2012 Paul Howarth <paul@city-fan.org> - 0.06-11
+- Separate bootstrap and RHEL conditionals
+- Drop %%defattr, redundant since rpm 4.4
+- Don't need to remove empty directories from buildroot
+- BR: perl(base)
+
 * Thu Jun  7 2012 Marcela Mašláňová <mmaslano@redhat.com> - 0.06-10
 - Conditionalize aspell-en & friends