diff --git a/perl-DBIx-Class.spec b/perl-DBIx-Class.spec
index d85dff9..7d142f7 100644
--- a/perl-DBIx-Class.spec
+++ b/perl-DBIx-Class.spec
@@ -2,7 +2,7 @@
 
 Name:           perl-DBIx-Class
 Version:        0.08010
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Extensible and flexible object <-> relational mapper
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -104,13 +104,7 @@ done
 # Filter unwanted Provides:
 cat << \EOF > %{name}-prov
 #!/bin/sh
-%{__perl_provides} $* |\
-  sed                               \
-    -e '/perl(DBICVersion::Schema) = 1.0/d'      \
-    -e '/perl(DBIC.*Test.*)/d'      \
-    -e '/perl(My.*)/d'              \
-    -e '/perl(DeletingFilm)/d'      \
-    -e '/perl(.*Thing)/d'
+%{__perl_provides} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` 
 EOF
 
 %define __perl_provides %{_builddir}/DBIx-Class-%{version}/%{name}-prov
@@ -119,14 +113,8 @@ chmod +x %{__perl_provides}
 # Filter unwanted Requires:
 cat << \EOF > %{name}-req
 #!/bin/sh
-%{__perl_requires} $* |\
-  sed                                   \
-    -e '/perl(Time::Piece::MySQL)/d'    \
-    -e '/perl(DBD::.*)/d'               \
-    -e '/perl(DBIC.*Test.*)/d'          \
-    -e '/perl(My.*)/d'                  \
-    -e '/perl(DeletingFilm)/d'          \
-    -e '/perl(.*Thing)/d'
+%{__perl_requires} `perl -p -e 's|\S+%{_docdir}/%{name}-%{version}\S+||'` |\
+    sed -e '/perl(DBD::Multi)/d; /perl(DBD::Pg)/d' 
 EOF
 
 %define __perl_requires %{_builddir}/DBIx-Class-%{version}/%{name}-req
@@ -162,6 +150,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Oct 05 2008 Chris Weyl <cweyl@alumni.drew.edu> 0.08010-8
+- filter all prov/req from anything under _docdir
+- note we still filter perl(DBD::Multi), at least until review bug bz#465690
+  is completed...
+- ...and perl(DBD::Pg) will always be filtered
+
 * Wed Oct 01 2008 Chris Weyl <cweyl@alumni.drew.edu> 0.08010-7
 - fix patch fuzz