diff --git a/mod_perl.spec b/mod_perl.spec
index 633dbaf..0cb3c99 100644
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@ -7,7 +7,7 @@
 
 Name:           mod_perl
 Version:        2.0.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        An embedded Perl interpreter for the Apache HTTP Server
 
 Group:          System Environment/Daemons
@@ -40,6 +40,8 @@ Requires:       perl(Linux::Pid)
 %global __provides_exclude %__provides_exclude|perl\\(Apache2::RequestRec\\)$
 %global __provides_exclude %__provides_exclude|perl\\(warnings\\)$
 %global __provides_exclude %__provides_exclude|perl\\(HTTP::Request::Common\\)$
+%global __provides_exclude %__provides_exclude|mod_perl\\.so\\(.*$
+%global __provides_exclude %__provides_exclude|mod_perl\\.so$
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Apache::Test.*\\)
 %global __requires_exclude %__requires_exclude|perl\\(Data::Flow\\)
 %global __requires_exclude %__requires_exclude|perl\\(Apache2::FunctionTable\\)
@@ -73,11 +75,11 @@ modules that use mod_perl.
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1 -b .inline
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1 -b .short-name
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1 -b .maps
+%patch5 -p1
 
 %build
 
@@ -109,7 +111,6 @@ CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL </dev/null \
          MP_APXS=%{_httpd_apxs} \
          MP_APR_CONFIG=%{_bindir}/apr-1-config
 
-
 make -C src/modules/perl %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS -fpic"
 make
 
@@ -135,9 +136,9 @@ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_httpd_modconfdir}/02-perl.conf
 
 # Move set of modules to -devel
-devmods="ModPerl::BuildMM ModPerl::CScan \
+devmods="ModPerl::Code ModPerl::BuildMM ModPerl::CScan \
           ModPerl::TestRun ModPerl::Config ModPerl::WrapXS \
-          ModPerl::Manifest \
+          ModPerl::BuildOptions ModPerl::Manifest \
           ModPerl::MapUtil ModPerl::StructureMap \
           ModPerl::TypeMap ModPerl::FunctionMap \
           ModPerl::ParseSource ModPerl::MM \
@@ -156,6 +157,9 @@ for m in $devmods; do
 done | tee devel.files | sed 's/^/%%exclude /' > exclude.files
 echo "%%exclude %{_mandir}/man3/Apache::Test*.3pm*" >> exclude.files
 
+# perl build script generates *.orig files, they get installed and later they
+# break provides so mod_perl requires mod_perl-devel. We remove them here.
+find "$RPM_BUILD_ROOT" -type f -name *.orig -exec rm -f {} \;
 
 %files -f exclude.files
 %doc Changes LICENSE NOTICE README* STATUS SVN-MOVE docs/
@@ -180,6 +184,10 @@ echo "%%exclude %{_mandir}/man3/Apache::Test*.3pm*" >> exclude.files
 %{_mandir}/man3/Apache::Test*.3pm*
 
 %changelog
+* Tue Nov 20 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0.7-10
+- do not install .orig file generated by make xs_generate
+- filter unversioned mod_perl.so from provides
+
 * Mon Nov 19 2012 Jan Kaluza <jkaluza@redhat.com> - 2.0.7-9
 - clean up spec file
 - do not require -devel when installing main package