diff --git a/.gitignore b/.gitignore
index 4ac9e0c..c726b77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-DBM-Deep-0.983.tar.gz
-/DBM-Deep-2.0004.tar.gz
+/DBM-Deep-[0-9.]*.tar.gz
diff --git a/perl-DBM-Deep.spec b/perl-DBM-Deep.spec
index e319c3c..d2ca04b 100644
--- a/perl-DBM-Deep.spec
+++ b/perl-DBM-Deep.spec
@@ -1,20 +1,34 @@
 Name:           perl-DBM-Deep
-Version:        2.0004
-Release:        3%{?dist}
+Version:        2.0005
+Release:        1%{?dist}
 Summary:        A pure perl multi-level hash/array DBM
 License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DBM-Deep/
 Source0:        http://www.cpan.org/modules/by-module/DBM/DBM-Deep-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  perl >= 3:5.8.4
+BuildRequires:  perl(base)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(constant)
+BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(DBD::SQLite)
+BuildRequires:  perl(DBI)
 BuildRequires:  perl(Digest::MD5)
+BuildRequires:  perl(Exporter)
+BuildRequires:  perl(FileHandle::Fmode)
 BuildRequires:  perl(Module::Build)
-BuildRequires:  perl(Test::Exception)
+BuildRequires:  perl(Pod::Usage) >= 1.3
 BuildRequires:  perl(Test::Deep)
+BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::Warn)
+BuildRequires:  perl(Test::Pod)
+BuildRequires:  perl(Test::Pod::Coverage)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # not automatically detected
+Requires:       perl(Carp)
+Requires:       perl(Data::Dumper)
 Requires:       perl(Digest::MD5)
 
 %description
@@ -35,21 +49,31 @@ export PERL_MM_USE_DEFAULT=1
 
 %install
 rm -rf %{buildroot}
-
 ./Build install destdir=%{buildroot} create_packlist=0
-find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;
-
-chmod -R u+rwX,go+rX,go-w %{buildroot}/*
+%{_fixperms} %{buildroot}
 
 %check
-./Build test
+LONG_TESTS=1 TEST_SQLITE=1 ./Build test
 
 %files
 %doc Changes README
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/DBM/
+%{_mandir}/man3/DBM::Deep*
 
 %changelog
+* Mon Mar 26 2012 Paul Howarth <paul@city-fan.org> - 2.0005-1
+- Update to 2.0005 (t/27_filehandle.t has been fixed again; it no longer
+  violates Test::Builder's encapsulation)
+- BR/R: perl(Carp) and perl(Data::Dumper)
+- Add buildreqs for module and support utilities: perl ≥ 5.8.4, perl(base),
+  perl(constant), perl(DBI), perl(FileHandle::Fmode) and perl(Pod::Usage) ≥ 1.3
+- Add buildreqs for additional test coverage: perl(DBD::SQLite),
+  perl(Exporter), perl(Test::Pod) and perl(Test::Pod::Coverage)
+- Run LONG_TESTS and SQLite tests too
+- Don't need to remove empty directories from the buildroot
+- Make %%files list more explicit
+- Use %%{_fixperms} macro rather than our own chmod incantation
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0004-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 70652b1..4c5363d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b329da1e68d203feed242b00ae3ebe7d  DBM-Deep-2.0004.tar.gz
+9533e36ec98a3c764d91d4daff9b2535  DBM-Deep-2.0005.tar.gz