diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index 3bdb73dc..8a5cec83 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -44,8 +44,8 @@ APU_LDFLAGS = @APU_LDFLAGS@
 APU_LIBS = @APU_LIBS@
 APU_LINK_LD = @APU_LINK_LD@
 
-CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS)
-LIBS = $(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
+CPPFLAGS = @CPPFLAGS@ $(PCRE_CFLAGS) $(LIBXML_CFLAGS) $(LUA_CFLAGS) 
+LIBS = @LIBS@ $(PCRE_LIBS) $(LIBXML_LIBS) $(LUA_LIBS)
 LDFLAGS = @LDFLAGS@
 
 COMPILE_APACHE_MOD = $(APXS_WRAPPER) -c $(CPPFLAGS) $(LDFLAGS) $(LIBS)
@@ -58,9 +58,11 @@ install: install-mods
 
 clean-extras:
 	@for dir in mlogc-src; do \
-	  test -e $$dir && $(MAKE) -C $$dir clean; \
-	done; \
-	rm -rf ../tools/mlogc ../tools/mlogc-static
+	  if test -d $$dir; then \
+			$(MAKE) -C $$dir clean; \
+		fi; \
+	done
+	@rm -rf ../tools/mlogc ../tools/mlogc-static
 
 clean: clean-extras
 	@rm -rf *.la *.lo *.o *.slo .libs msc_test
diff --git a/apache2/build/find_apr.m4 b/apache2/build/find_apr.m4
index b2594ad8..f69d9ac5 100644
--- a/apache2/build/find_apr.m4
+++ b/apache2/build/find_apr.m4
@@ -23,7 +23,7 @@ AC_ARG_WITH(
 
 dnl # Determine apr lib directory
 if test -z "${apr_path}"; then
-    test_paths="/usr/local /usr"
+    test_paths="/usr/local/apr /usr/local /usr"
 else
     test_paths="${apr_path}"
 fi
@@ -41,6 +41,9 @@ for x in ${test_paths}; do
             with_apr=""
         fi
     done
+		if test -n "$with_apr"; then
+		    break
+		fi
 done
 if test -n "${with_apr}"; then
     APR_CONFIG="${with_apr}/${APR_CONFIG}"
diff --git a/apache2/build/find_apu.m4 b/apache2/build/find_apu.m4
index 01998c22..82fc79c4 100644
--- a/apache2/build/find_apu.m4
+++ b/apache2/build/find_apu.m4
@@ -23,7 +23,7 @@ AC_ARG_WITH(
 
 dnl # Determine apu lib directory
 if test -z "${apu_path}"; then
-    test_paths="/usr/local /usr"
+    test_paths="/usr/local/apu /usr/local/apr-util /usr/local /usr"
 else
     test_paths="${apu_path}"
 fi
diff --git a/apache2/build/find_lua.m4 b/apache2/build/find_lua.m4
index 04ebf4b1..9611f3d7 100644
--- a/apache2/build/find_lua.m4
+++ b/apache2/build/find_lua.m4
@@ -5,7 +5,7 @@ dnl  LUA_CFLAGS
 dnl  LUA_LIBS
 
 LUA_CONFIG="pkg-config"
-LUA_PKGNAME="lua5.1"
+LUA_PKGNAME="lua51"
 LUA_CFLAGS=""
 LUA_LIBS=""
 
@@ -47,14 +47,25 @@ else
     dnl Hack to just try to find the lib and include
     AC_MSG_CHECKING([for lua install])
     for x in ${test_paths}; do
-        if test -e "${x}/liblua5.1.so"; then
+        if test -e "${x}/liblua5.1.a"; then
             with_lua_lib="${x}"
+						lua_lib_name="lua5.1"
             break
-        elif test -e "${x}/lib/liblua5.1.so"; then
+        elif test -e "${x}/lib/liblua5.1.a"; then
             with_lua_lib="${x}/lib"
+						lua_lib_name="lua5.1"
+            break
+        elif test -e "${x}/liblua.a"; then
+            with_lua_lib="${x}"
+						lua_lib_name="lua"
+            break
+        elif test -e "${x}/lib/liblua.a"; then
+            with_lua_lib="${x}/lib"
+						lua_lib_name="lua"
             break
         else
             with_lua_lib=""
+						lua_lib_name=""
         fi
     done
     for x in ${test_paths}; do
@@ -72,7 +83,7 @@ else
         LUA_CONFIG=""
         AC_MSG_RESULT([${with_lua_lib} ${with_lua_inc}])
         LUA_CFLAGS="-I${with_lua_inc}"
-        LUA_LIBS="-L${with_lua_lib} -llua5.1"
+        LUA_LIBS="-L${with_lua_lib} -l${lua_lib_name}"
         CFLAGS=$save_CFLAGS
         LDFLAGS=$save_LDFLAGS
     else
diff --git a/apache2/configure.in b/apache2/configure.in
index 483be194..9f851e6d 100644
--- a/apache2/configure.in
+++ b/apache2/configure.in
@@ -20,7 +20,7 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_RANLIB
-AC_PATH_PROGS(PERL, perl perl5, )
+AC_PATH_PROGS(PERL, [perl perl5], )
 
 # Checks for header files.
 AC_HEADER_STDC