diff --git a/apache2/Makefile.am b/apache2/Makefile.am
index e20f2368..559b13ab 100644
--- a/apache2/Makefile.am
+++ b/apache2/Makefile.am
@@ -15,7 +15,7 @@ mod_security2_la_SOURCES = mod_security2.c \
 
 mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
                           @LIBXML2_CFLAGS@ @LUA_CFLAGS@
-mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @LUA_CPPFLAGS@
+mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
 mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
 
 if AIX
diff --git a/build/find_lua.m4 b/build/find_lua.m4
index 01ec22e3..6fe7406c 100644
--- a/build/find_lua.m4
+++ b/build/find_lua.m4
@@ -4,19 +4,21 @@ dnl Sets:
 dnl  LUA_CFLAGS
 dnl  LUA_LIBS
 
+AC_DEFUN([CHECK_LUA],
+[dnl
+
+AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+
 LUA_CONFIG=""
 LUA_VERSION=""
 LUA_CFLAGS=""
 LUA_CPPFLAGS=""
 LUA_LDADD=""
 LUA_LDFLAGS=""
-LUA_CONFIG=pkg-config
+LUA_CONFIG=${PKG_CONFIG}
 LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua"
 LUA_SONAMES="so la sl dll dylib"
 
-AC_DEFUN([CHECK_LUA],
-[dnl
-
 AC_ARG_WITH(
     lua,
     [AC_HELP_STRING([--with-lua=PATH],[Path to lua prefix or config script])]
@@ -69,10 +71,8 @@ if test -n "${LUA_PKGNAME}"; then
     AC_MSG_RESULT([${LUA_CONFIG}])
     LUA_VERSION="`${LUA_CONFIG} ${LUA_PKGNAME} --modversion`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua VERSION: $LUA_VERSION); fi
-    LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags-only-I`"
+    LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME}`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua CFLAGS: $LUA_CFLAGS); fi
-    LUA_CPPFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags-only-other`"
-    if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua CPPFLAGS: $LUA_CPPFLAGS); fi
     LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`"
     if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(lua LDADD: $LUA_LDADD); fi
     LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other`"
@@ -180,14 +180,11 @@ else
 fi
 
 if test -n "${LUA_LIBS}"; then
-    LUA_CPPFLAGS="-DWITH_LUA"
+    LUA_CFLAGS="-DWITH_LUA"
 fi
 ])
 
-AC_SUBST(LUA_CONFIG)
-AC_SUBST(LUA_VERSION)
 AC_SUBST(LUA_CFLAGS)
-AC_SUBST(LUA_CPPFLAGS)
 AC_SUBST(LUA_LDADD)
 AC_SUBST(LUA_LDFLAGS)
 
diff --git a/configure.ac b/configure.ac
index 880478e2..a4e2eb35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,9 +581,6 @@ CHECK_APU()
 fi
 CHECK_LIBXML2()
 CHECK_LUA()
-if test -n "$LUA_VERSION"; then
-    LUA_CFLAGS="-DWITH_LUA $LUA_CFLAGS"
-fi
 if test "$build_mlogc" -ne 0; then
 CHECK_CURL()
 fi
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 99417640..58964a3f 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,7 +1,7 @@
 EXT_CFLAGS = -I../apache2 \
 			 @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
 			 @LIBXML2_CFLAGS@ @LUA_CFLAGS@
-EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @LUA_CPPFLAGS@
+EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
 EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
 EXT_LDFLAGS = -no-undefined -module -avoid-version \
 			  @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8f8170e4..a32fbc07 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -23,7 +23,7 @@ msc_test_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
                   @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@
 msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
                     @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ \
-                    @PCRE_CPPFLAGS@ @LUA_CPPFLAGS@
+                    @PCRE_CPPFLAGS@
 msc_test_LDADD = @APR_LDADD@ @APU_LDADD@ \
                  @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
 msc_test_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \