diff --git a/perl-ExtUtils-CBuilder.spec b/perl-ExtUtils-CBuilder.spec
index e7ea379..9516ca4 100644
--- a/perl-ExtUtils-CBuilder.spec
+++ b/perl-ExtUtils-CBuilder.spec
@@ -1,14 +1,12 @@
 Name:           perl-ExtUtils-CBuilder
-Version:        0.19
-Release:        1%{?dist}.1
+Version:        0.21
+Release:        1%{?dist}
 Summary:        Compile and link C code for Perl modules
-
-Group:          Development/Libraries
 License:        GPL+ or Artistic
+Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/ExtUtils-CBuilder/
 Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/ExtUtils-CBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -19,40 +17,43 @@ appropriate compilers and linkers in a cross-platform manner. It was
 motivated by the Module::Build project, but may be useful for other
 purposes as well.
 
-
 %prep
 %setup -q -n ExtUtils-CBuilder-%{version}
 
-
 %build
 %{__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 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 \;
+
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
 make test
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes
-%{perl_vendorlib}/ExtUtils/
-%{_mandir}/man3/*.3pm*
-
+%doc Changes README
+%{perl_vendorlib}/*
+%{_mandir}/man3/*
 
 %changelog
+* Tue Dec 11 2007 Steven Pritchard <steve@kspei.com> 0.21-1
+- Update to 0.21.
+- Use fixperms macro instead of our own chmod incantation.
+- Reformat to more closely match cpanspec output (but don't use
+  Module::Build, since that would create a dependency loop).
+- Package README.
+
 * Mon Oct 15 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 0.19-1.1
 - correct license tag
 - add BR: perl(ExtUtils::MakeMaker)