Index: src/modules/perl/modperl_interp.c
===================================================================
--- src/modules/perl/modperl_interp.c	(revision 1324590)
+++ src/modules/perl/modperl_interp.c	(working copy)
@@ -500,7 +500,7 @@
                    "set interp 0x%lx in %s 0x%lx (%s request for %s)\n",
                    (unsigned long)interp, desc, (unsigned long)p,
                    (r ? (is_subrequest ? "sub" : "main") : "conn"),
-                   (r ? r->uri : c->remote_ip));
+                   (r ? r->uri : c->client_ip));
     }
 
     /* set context (THX) for this thread */
Index: xs/tables/current/Apache2/StructureTable.pm
===================================================================
--- xs/tables/current/Apache2/StructureTable.pm	(revision 1324590)
+++ xs/tables/current/Apache2/StructureTable.pm	(working copy)
@@ -2708,11 +2708,11 @@
       },
       {
         'type' => 'apr_sockaddr_t *',
-        'name' => 'remote_addr'
+        'name' => 'client_addr'
       },
       {
         'type' => 'char *',
-        'name' => 'remote_ip'
+        'name' => 'client_ip'
       },
       {
         'type' => 'char *',
@@ -2955,6 +2955,14 @@
       },
       {
         'type' => 'char *',
+        'name' => 'useragent_ip'
+      },
+      {
+        'type' => 'apr_sockaddr_t *',
+        'name' => 'useragent_addr'
+      },
+      {
+        'type' => 'char *',
         'name' => 'the_request'
       },
       {
@@ -3245,10 +3253,6 @@
       },
       {
         'type' => 'int',
-        'name' => 'loglevel'
-      },
-      {
-        'type' => 'int',
         'name' => 'is_virtual'
       },
       {
Index: Apache-Reload/Makefile.PL
===================================================================
--- Apache-Reload/Makefile.PL	(revision 1324590)
+++ Apache-Reload/Makefile.PL	(working copy)
@@ -11,7 +11,7 @@
 # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should
 # also set MP_APXS
 if ($ENV{MOD_PERL_2_BUILD}) {
-    push @ARGV, "-apxs", $ENV{MP_APXS};
+    push @ARGV, "-apxs $ENV{MP_APXS}";
     my $mp_gen = satisfy_mp_generation(2);
 }
 else {
Index: Apache-SizeLimit/Makefile.PL
===================================================================
--- Apache-SizeLimit/Makefile.PL	(revision 1324590)
+++ Apache-SizeLimit/Makefile.PL	(working copy)
@@ -11,7 +11,7 @@
 # MOD_PERL_2_BUILD is set from building from mod_perl Makefile.PL which should
 # also set MP_APXS
 if ($ENV{MOD_PERL_2_BUILD}) {
-    push @ARGV, "-apxs", $ENV{MP_APXS};
+    push @ARGV, "-apxs $ENV{MP_APXS}";
     my $mp_gen = satisfy_mp_generation(2);
 }
 else {