diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index 38099a1d..53db5c4a 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -44,7 +44,7 @@ APU_LDFLAGS = @APU_LDFLAGS@
 APU_LIBS = @APU_LIBS@
 APU_LINK_LD = @APU_LINK_LD@
 
-CPPFLAGS=$(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
+CPPFLAGS=@CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
 LIBS=$(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
 LDFLAGS=
 
diff --git a/apache2/configure.in b/apache2/configure.in
index 9325ee16..b86373f1 100644
--- a/apache2/configure.in
+++ b/apache2/configure.in
@@ -103,6 +103,7 @@ AC_ARG_WITH(httpd-src,
                             [PATH is to the Apache httpd source tree where srclib will be used as a base for pcre, apr and apu config scripts.])],
 [
   if test -n "$withval"; then
+    CPPFLAGS="$CPPFLAGS -I$withval/srclib/pcre"
     pcre_path="$withval/srclib/pcre"
     apr_path="$withval/srclib/apr"
     apu_path="$withval/srclib/apr-util"
@@ -216,7 +217,6 @@ done;
 
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$APXS_INCLUDES $CPPFLAGS"
-CPPFLAGS=$save_CPPFLAGS
 
 AC_SUBST(EXTRA_CFLAGS)
 AC_SUBST(MODSEC_EXTRA_CFLAGS)