diff --git a/apache2-mod_perl.changes b/apache2-mod_perl.changes
index 73b6426..7630bfc 100644
--- a/apache2-mod_perl.changes
+++ b/apache2-mod_perl.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Apr  6 10:12:07 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 2.0.7+svn1448242 (http24 branch):
+  + Fix build with Apache 2.4.
+- Update to version 2.0.7:
+  + Fix breakage caused by removal of PL_uid et al from perl 5.16.0.
+- Drop patch-PL_uid.diff: fixed upstream.
+- Adjust extra.conf setup for the test suite: include the
+  nescessary modules needed to have a valid configuration for the
+  test server: access_compat_module, authn_core_module,
+  authz_core_module and unixd_module.
+
 -------------------------------------------------------------------
 Thu Oct 11 08:35:53 UTC 2012 - coolo@suse.com
 
diff --git a/apache2-mod_perl.spec b/apache2-mod_perl.spec
index 8679470..d86aa6d 100644
--- a/apache2-mod_perl.spec
+++ b/apache2-mod_perl.spec
@@ -2,7 +2,7 @@
 #
 # spec file for package apache2-mod_perl
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -52,13 +52,11 @@ Requires:       perl-libwww-perl
 Url:            http://perl.apache.org/
 Obsoletes:      mod_perl_2
 Conflicts:      mod_perl
-Version:        2.0.6
+Version:        2.0.7+svn1448242
 Release:        0
 Source0:        http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
 Patch:          %{name}-2.0.4-tests.diff
 Patch1:         lfs-perl-5.14.patch 
-# RT#77129
-Patch2:         patch-PL_uid.diff
 #%define apache_test_version 1_99_15
 # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version}
 #Source1:      Apache-Test-%{apache_test_version}.tar.bz2
@@ -119,11 +117,10 @@ software depending on apache2-mod_perl.
 #%setup -q -n modperl-2.0 -a 1
 %setup -q -n mod_perl-%{version}
 %patch1 -p1
-%patch2
 find -name ".svn" -type d | xargs rm -rfv
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor MP_APXS=`which %{apxs}` MP_CCOPTS="$(%{apxs} -q CFLAGS)"
+perl Makefile.PL INSTALLDIRS=vendor MP_APXS=`which %{apxs}` MP_APR_CONFIG=/usr/bin/apr-1-config MP_CCOPTS="$(%{apxs} -q CFLAGS)"
 ln -s Apache-mod_perl_guide-1.29/bin bin
 make %{?_smp_mflags}
 # XXX mod_include/SSI does not include files when they are not named .shtml
@@ -149,6 +146,10 @@ if test -e ModPerl-Registry/t/cgi-bin/r_inherited.pl; then chmod +x ModPerl-Regi
 # enable more apache modules
 # we can't simply use a2enmod, since we are not root.
 cat >> t/conf/extra.conf.in <<-EOF
+        LoadModule access_compat_module /usr/%_lib/apache2-prefork/mod_access_compat.so
+        LoadModule authn_core_module /usr/%_lib/apache2-prefork/mod_authn_core.so
+        LoadModule authz_core_module /usr/%_lib/apache2-prefork/mod_authz_core.so
+        LoadModule unixd_module      /usr/%_lib/apache2-prefork/mod_unixd.so
 	LoadModule deflate_module    /usr/%_lib/apache2-prefork/mod_deflate.so
 	LoadModule proxy_module      /usr/%_lib/apache2-prefork/mod_proxy.so
 	LoadModule proxy_http_module /usr/%_lib/apache2-prefork/mod_proxy_http.so
@@ -163,6 +164,7 @@ chmod 2770 t/htdocs/hooks
 #	| grep -v grep | awk '{print $2}' | xargs -r kill
 #	exit 1
 #}
+mkdir t/run
 t/TEST -start-httpd -port select -startup_timeout 720
 t/TEST -run-tests || true
 #t/TEST -run-tests || {
@@ -264,6 +266,7 @@ EOF
 %{__cp} -av docs/api/APR/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/APR/
 %{__cp} -av docs/api/Apache2/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/Apache2/
 %{__cp} -av docs/api/ModPerl/*.pod $RPM_BUILD_ROOT/%{perl_vendorarch}/ModPerl/
+find "%{buildroot}" -type f -name '*.orig' -delete -print
 
 %files
 %defattr(-,root,root)
@@ -291,5 +294,6 @@ EOF
 %files devel
 %defattr(-,root,root)
 %{apache_includedir}/*
+%{perl_vendorarch}/MyTest/
 
 %changelog
diff --git a/mod_perl-2.0.6.tar.gz b/mod_perl-2.0.6.tar.gz
deleted file mode 100644
index b9a73d5..0000000
--- a/mod_perl-2.0.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc
-size 3784836
diff --git a/mod_perl-2.0.7+svn1448242.tar.gz b/mod_perl-2.0.7+svn1448242.tar.gz
new file mode 100644
index 0000000..fd83d66
--- /dev/null
+++ b/mod_perl-2.0.7+svn1448242.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9260f2076684ea6ee34cc03ba75ea2fcd362cca8fca6602013ba718196e8bc9
+size 3885475
diff --git a/patch-PL_uid.diff b/patch-PL_uid.diff
deleted file mode 100644
index 20bb392..0000000
--- a/patch-PL_uid.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: src/modules/perl/modperl_perl.c
-===================================================================
---- src/modules/perl/modperl_perl.c	2012-05-21 10:06:24.000000000 +0000
-+++ src/modules/perl/modperl_perl.c	2012-05-21 10:08:56.000000000 +0000
-@@ -101,6 +101,7 @@
- {
-     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
- 
-+#if !MP_PERL_VERSION_AT_LEAST(5, 16, 0)
- #ifndef WIN32
-     PL_uid  = ids->uid;
-     PL_euid = ids->euid;
-@@ -110,6 +111,7 @@
- #ifdef MP_MAINTAIN_PPID
-     PL_ppid = ids->ppid;
- #endif
-+#endif
- }
- 
-