diff --git a/perl-Archive-Zip.spec b/perl-Archive-Zip.spec
index 06b34d2..4b0d35d 100644
--- a/perl-Archive-Zip.spec
+++ b/perl-Archive-Zip.spec
@@ -1,6 +1,6 @@
 Name:           perl-Archive-Zip
 Version:        1.20
-Release:        1
+Release:        2%{?dist}
 Summary:        Perl library for accessing Zip archives
 
 Group:          Development/Libraries
@@ -10,7 +10,12 @@ Source0:        http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-%{
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  perl(Compress::Zlib)
+BuildRequires:  perl(Compress::Zlib) >= 1.14
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(File::Which) >= 0.05
+BuildRequires:  unzip
+BuildRequires:  zip
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -40,11 +45,11 @@ make %{?_smp_mflags}
 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 -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+%{_fixperms} $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -54,13 +59,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc Changes README examples/
+%doc Changes LICENSE README docs/ examples/
 %{_bindir}/crc32
 %{perl_vendorlib}/Archive/
 %{_mandir}/man3/Archive*.3*
 
 
 %changelog
+* Wed Jun 27 2007 Robin Norwood <rnorwood@redhat.com> - 1.20-2
+- Resolves: rhbz#226240
+- Incorporate changes from Steven Pritchard's package review
+- Fix find option order.
+- Use fixperms macro instead of our own chmod incantation.
+- Remove check macro cruft.
+- Update build dependencies.
+- Package LICENSE.
+- BR unzip, zip for better test coverage.
+
 * Tue Jun 05 2007 Robin Norwood <rnorwood@redhat.com> - 1.20-1
 - Update to latest CPAN version: 1.20
 - Fix broken changelog