diff --git a/.cvsignore b/.cvsignore
index 215e4c1..a6497d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-libwww-perl-5.803.tar.gz
-libwww-perl-5.805.tar.gz
+libwww-perl-5.808.tar.gz
diff --git a/filter-depends.sh b/filter-depends.sh
deleted file mode 100755
index 60c8098..0000000
--- a/filter-depends.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/find-requires.perl $* | grep -v HTTP::GHTTP | grep -v Win32 | grep -v NTLM
diff --git a/perl-libwww-perl.spec b/perl-libwww-perl.spec
index 645f32a..3307974 100644
--- a/perl-libwww-perl.spec
+++ b/perl-libwww-perl.spec
@@ -1,23 +1,21 @@
 Name:           perl-libwww-perl
-Version:        5.805
-Release: 	1.1.1
+Version:        5.808
+Release:        1%{?dist}
 Summary:        A Perl interface to the World-Wide Web
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/libwww-perl/
-Source0: 	http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
-Source10:       filter-depends.sh
+Source0:        http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-BuildRequires:  perl(HTML::Entities), perl(URI)
-Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(HTML::Entities), perl(URI), perl(Test::More), perl(ExtUtils::MakeMaker)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Compress::Zlib)
 Requires:       perl-HTML-Parser >= 3.33
 
-%define __perl_requires %{SOURCE10}
 
 %description
 The libwww-perl collection is a set of Perl modules which provides a
@@ -33,6 +31,30 @@ help you implement simple HTTP servers.
 # Install the aliases by default
 %{__perl} -pi -e 's|my \$default = "n";|my \$default = "y";|' Makefile.PL
 
+# Filter unwanted Provides:
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+  sed -e '/perl(HTTP::Headers)/d'
+EOF
+
+%define __perl_provides %{_builddir}/libwww-perl-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+  sed -e '/perl(HTTP::GHTTP)/d' |\
+  sed -e '/perl(Win32)/d' |\
+  sed -e '/perl(Authen::NTLM)/d'
+EOF
+
+%define __perl_requires %{_builddir}/libwww-perl-%{version}/%{name}-req
+chmod +x %{__perl_requires}
+
+
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
@@ -48,9 +70,9 @@ file=$RPM_BUILD_ROOT%{_mandir}/man3/LWP.3pm
 iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 mv -f "${file}_" "$file"
 
-%check || :
-#make test
-# test fails in beehive but not everything install #150363
+%check
+make test
+
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -74,7 +96,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
+* Mon Aug 13 2007 Robin Norwood <rnorwood@redhat.com> - 5.808-1
+- Update to latest CPAN version
+- Re-enable tests.  We'll see if they work now
+- Move Requires filter into spec file
+- Add Provides filter for unnecessary unversioned provides
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.805-1.1.1
 - rebuild
 
 * Fri Feb 03 2006 Jason Vas Dias <jvdias@redhat.com> - 5.805-1.1
diff --git a/sources b/sources
index f769198..8e3c255 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db1eb693eee45d251966ad2bab49dbbf  libwww-perl-5.805.tar.gz
+72120d9195ab1649c2d787eb1102a90c  libwww-perl-5.808.tar.gz