diff --git a/macros.perl b/macros.perl
index 436c49e..9ba91e9 100644
--- a/macros.perl
+++ b/macros.perl
@@ -4,6 +4,7 @@
 # rpm core; but won't cause a build to fail if they're not present.
 #
 # Chris Weyl <cweyl@alumni.drew.edu> 2009
+# Marcela Mašláňová <mmaslano@redhat.com> 2011
 
 # This macro unsets several common vars used to control how Makefile.PL (et
 # al) build and install packages.  We also set a couple to help some of the
@@ -27,7 +28,11 @@ export PERL_MM_USE_DEFAULT=1
 # keep track of what "revision" of the filtering we're at.  Each time we
 # change the filter we should increment this.
 
-%perl_default_filter_revision 2
+%perl_default_filter_revision 3
+
+# Perl provides/requeries are generated by external generators.
+%global __perl_provides /usr/lib/rpm/perl.prov
+%global __perl_requires /usr/lib/rpm/perl.req
 
 # By default, for perl packages we want to filter all files in _docdir from 
 # req/prov scanning, as well as filtering out any provides caused by private 
@@ -37,10 +42,8 @@ export PERL_MM_USE_DEFAULT=1
 # "%{?perl_default_filter}", before any %description block.
 
 %perl_default_filter %{?filter_setup: %{expand: \
-%filter_provides_in %{perl_vendorarch}/.*\\.so$ \
-%filter_provides_in -P %{perl_archlib}/(?!CORE/libperl).*\\.so$ \
-%filter_provides_in %{_docdir} \
-%filter_requires_in %{_docdir} \
+%define __provides_exclude_from (%{_perl_vendorarch}\/auto\/*|%{perl_archlib}/(?!CORE/libperl).*)\.so*|%{_docdir} \
+%define __requires_exclude_from %{_docdir} \
 %filter_setup \
 }}