diff --git a/Makefile.am b/Makefile.am
index f29586d9..f9b4d878 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,32 +5,31 @@ CLEANFILES =
 MAINTAINERCLEANFILES =
 
 CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
-   tests/regression/server_root/logs/*.log
+    tests/regression/server_root/logs/*.log
 
 MAINTAINERCLEANFILES += $(CLEANFILES) \
-       Makefile.in \
-       aclocal.m4 \
-       alp2/Makefile.in \
-       apache2/Makefile.in \
-       build/config.guess \
-       build/config.sub \
-       build/depcomp \
-       build/libtool.m4 \
-       build/ltmain.sh \
-       build/ltoptions.m4 \
-       build/ltsugar.m4 \
-       build/ltversion.m4 \
-       build/lt~obsolete.m4 \
-       build/missing \
-       configure \
-       ext/Makefile.in \
-       mlogc/Makefile.in \
-       modsecurity_config_auto.h.in~ \
-       config.log \
-       Makefile \
-       config.status
+    aclocal.m4 \
+    alp2/Makefile.in \
+    apache2/Makefile.in \
+    build/config.guess \
+    build/config.sub \
+    build/depcomp \
+    build/libtool.m4 \
+    build/ltmain.sh \
+    build/lt~obsolete.m4 \
+    build/ltoptions.m4 \
+    build/ltsugar.m4 \
+    build/ltversion.m4 \
+    build/missing \
+    config.log \
+    config.status \
+    configure \
+    ext/Makefile.in \
+    Makefile \
+    Makefile.in \
+    mlogc/Makefile.in \
+    modsecurity_config_auto.h.in~
 
-# Alias for "check"
 test: check
 
 test-regression:
diff --git a/alp2/Makefile.am b/alp2/Makefile.am
index 4b475451..aaab6293 100644
--- a/alp2/Makefile.am
+++ b/alp2/Makefile.am
@@ -1,6 +1,13 @@
 lib_LTLIBRARIES = libalp2.la
-include_HEADERS = alp2.h alp2_pp.h
 
-libalp2_la_SOURCES = alp2.c alp2_pp.c
-libalp2_la_CFLAGS = @APR_CFLAGS@ @APU_CFLAGS@
-libalp2_la_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@
+include_HEADERS = alp2.h \
+    alp2_pp.h
+
+libalp2_la_SOURCES = alp2.c \
+    alp2_pp.c
+
+libalp2_la_CFLAGS = @APR_CFLAGS@ \
+    @APU_CFLAGS@
+    
+libalp2_la_LDFLAGS = @APR_LDFLAGS@ \
+    @APU_LDFLAGS@
diff --git a/apache2/Makefile.am b/apache2/Makefile.am
index 550be2ed..8708882a 100644
--- a/apache2/Makefile.am
+++ b/apache2/Makefile.am
@@ -1,70 +1,132 @@
 pkglibdir = $(prefix)/lib
 pkglib_LTLIBRARIES = mod_security2.la
-#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
-#                  msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
-#                  persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
-#                  msc_lua.h msc_release.h
 
-mod_security2_la_SOURCES = mod_security2.c \
-                           apache2_config.c apache2_io.c apache2_util.c \
-                           re.c re_operators.c re_actions.c re_tfns.c \
-                           re_variables.c msc_logging.c msc_xml.c \
-                           msc_multipart.c modsecurity.c msc_parsers.c \
-                           msc_util.c msc_pcre.c persist_dbm.c msc_reqbody.c \
-                           msc_geo.c msc_gsb.c msc_crypt.c msc_tree.c msc_unicode.c acmp.c msc_lua.c msc_release.c \
-                           libinjection/libinjection_sqli.c
+mod_security2_la_SOURCES = acmp.c \
+    apache2_config.c \
+    apache2_io.c \
+    apache2_util.c \
+    libinjection/libinjection_sqli.c \
+    mod_security2.c \
+    modsecurity.c \
+    msc_crypt.c \
+    msc_geo.c \
+    msc_gsb.c \
+    msc_logging.c \
+    msc_lua.c \
+    msc_multipart.c \
+    msc_parsers.c \
+    msc_pcre.c \
+    msc_release.c \
+    msc_reqbody.c \
+    msc_tree.c \
+    msc_unicode.c \
+    msc_util.c \
+    msc_xml.c \
+    persist_dbm.c \
+    re_actions.c \
+    re.c \
+    re_operators.c \
+    re_tfns.c \
+    re_variables.c
 
-mod_security2_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-                          @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@
-mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
-mod_security2_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+mod_security2_la_CFLAGS = @APR_CFLAGS@ \
+    @APU_CFLAGS@ \
+    @APXS_CFLAGS@ \
+    @CURL_CFLAGS@ \
+    @LIBXML2_CFLAGS@ \
+    @LUA_CFLAGS@ \
+    @MODSEC_EXTRA_CFLAGS@ \
+    @PCRE_CFLAGS@ 
+
+
+mod_security2_la_CPPFLAGS = @APR_CPPFLAGS@ \
+    @LIBXML2_CPPFLAGS@ \
+    @PCRE_CPPFLAGS@
+
+mod_security2_la_LIBADD = @APR_LDADD@ \
+    @APU_LDADD@ \
+    @LIBXML2_LDADD@ \
+    @LUA_LDADD@ \
+    @PCRE_LDADD@
 
 if AIX
 mod_security2_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if HPUX
 mod_security2_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if MACOSX
 mod_security2_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if SOLARIS
 mod_security2_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if LINUX
 mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version -R @PCRE_LD_PATH@ \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if FREEBSD
 mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if OPENBSD
 mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if NETBSD
 mod_security2_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if LINUX
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 58964a3f..c98ca38a 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,17 +1,32 @@
+
 EXT_CFLAGS = -I../apache2 \
-			 @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-			 @LIBXML2_CFLAGS@ @LUA_CFLAGS@
-EXT_CPPFLAGS = @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@
-EXT_LIBADD = @APR_LDADD@ @APU_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+    @APR_CFLAGS@ \
+    @APU_CFLAGS@ \
+    @APXS_CFLAGS@ \
+    @LIBXML2_CFLAGS@ \
+    @LUA_CFLAGS@
+    
+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@ \
-			  @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@
 
 pkglibdir = $(prefix)/lib
+
 pkglib_LTLIBRARIES = mod_op_strstr.la \
-					 mod_tfn_reverse.la \
-					 mod_var_remote_addr_port.la \
-					 mod_reqbody_example.la
+    mod_tfn_reverse.la \
+    mod_var_remote_addr_port.la \
+    mod_reqbody_example.la
 
 mod_op_strstr_la_SOURCES = mod_op_strstr.c
 mod_op_strstr_la_CFLAGS = $(EXT_CFLAGS)
diff --git a/mlogc/Makefile.am b/mlogc/Makefile.am
index 2b088d97..e84e3de5 100644
--- a/mlogc/Makefile.am
+++ b/mlogc/Makefile.am
@@ -1,8 +1,23 @@
+
 bin_SCRIPTS = mlogc-batch-load.pl
+
 bin_PROGRAMS = mlogc
+
 mlogc_SOURCES = mlogc.c
-mlogc_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @CURL_CPPFLAGS@ \
-				 -I$(top_srcdir)/apache2
-mlogc_CFLAGS = @APR_CFLAGS@ @PCRE_CFLAGS@ @CURL_CFLAGS@
-mlogc_LDFLAGS = @APR_LDFLAGS@ @PCRE_LDFLAGS@ @CURL_LDFLAGS@
-mlogc_LDADD = @APR_LDADD@ @PCRE_LDADD@ @CURL_LDADD@
+
+mlogc_CPPFLAGS = @APR_CPPFLAGS@ \
+    @PCRE_CPPFLAGS@ \
+    @CURL_CPPFLAGS@ \
+    -I$(top_srcdir)/apache2
+
+mlogc_CFLAGS = @APR_CFLAGS@ \
+    @CURL_CFLAGS@ \
+    @PCRE_CFLAGS@
+    
+mlogc_LDFLAGS = @APR_LDFLAGS@ \
+    @CURL_LDFLAGS@ \
+    @PCRE_LDFLAGS@
+    
+mlogc_LDADD = @APR_LDADD@ \
+    @CURL_LDADD@ \
+    @PCRE_LDADD@
diff --git a/standalone/Makefile.am b/standalone/Makefile.am
index 5678f6a9..f75c2d87 100644
--- a/standalone/Makefile.am
+++ b/standalone/Makefile.am
@@ -1,94 +1,139 @@
 pkglibdir = $(prefix)/lib
+
 pkglib_LTLIBRARIES = standalone.la
-#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \
-#                  msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \
-#                  persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \
-#                  msc_lua.h msc_release.h
 
-standalone_la_SOURCES = ../apache2/mod_security2.c \
-                           ../apache2/apache2_config.c ../apache2/apache2_io.c ../apache2/apache2_util.c \
-                           ../apache2/re.c ../apache2/re_operators.c ../apache2/re_actions.c ../apache2/re_tfns.c \
-                           ../apache2/re_variables.c ../apache2/msc_logging.c ../apache2/msc_xml.c \
-                           ../apache2/msc_multipart.c ../apache2/modsecurity.c ../apache2/msc_parsers.c \
-                           ../apache2/msc_util.c ../apache2/msc_pcre.c ../apache2/persist_dbm.c ../apache2/msc_reqbody.c \
-     			   ../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \
-     			   ../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \
-     			   ../apache2/msc_crypt.c ../apache2/msc_tree.c ../apache2/libinjection/libinjection_sqli.c \
-                           api.c buckets.c \
-                           config.c filters.c \
-                           hooks.c \
-                           regex.c server.c
+standalone_la_SOURCES = ../apache2/acmp.c \
+    ../apache2/apache2_config.c \
+    ../apache2/apache2_io.c \
+    ../apache2/apache2_util.c \
+    ../apache2/libinjection/libinjection_sqli.c \
+    ../apache2/mod_security2.c \
+    ../apache2/modsecurity.c \
+    ../apache2/msc_crypt.c \
+    ../apache2/msc_geo.c \
+    ../apache2/msc_gsb.c \
+    ../apache2/msc_logging.c \
+    ../apache2/msc_lua.c \
+    ../apache2/msc_multipart.c \
+    ../apache2/msc_parsers.c \
+    ../apache2/msc_pcre.c \
+    ../apache2/msc_release.c \
+    ../apache2/msc_reqbody.c \
+    ../apache2/msc_tree.c \
+    ../apache2/msc_unicode.c \
+    ../apache2/msc_util.c \
+    ../apache2/msc_xml.c \
+    ../apache2/persist_dbm.c \
+    ../apache2/re_actions.c \
+    ../apache2/re.c \
+    ../apache2/re_operators.c \
+    ../apache2/re_tfns.c \
+    ../apache2/re_variables.c \
+    api.c \
+    buckets.c \
+    config.c \
+    filters.c \
+    hooks.c \
+    regex.c \
+    server.c
 
-standalone_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-                          @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -DVERSION_NGINX
-standalone_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@
-standalone_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
+    # FIXME: Standalone does not mean that it will be a nginx build.
+standalone_la_CFLAGS = -DVERSION_NGINX \
+    @APR_CFLAGS@ \
+    @APU_CFLAGS@ \
+    @APXS_CFLAGS@ \
+    @CURL_CFLAGS@ \
+    @LIBXML2_CFLAGS@ \
+    @LUA_CFLAGS@ \
+    @MODSEC_EXTRA_CFLAGS@ \
+    @PCRE_CFLAGS@
+
+standalone_la_CPPFLAGS = @APR_CPPFLAGS@ \
+    @LIBXML2_CPPFLAGS@ \
+    @PCRE_CPPFLAGS@
+    
+standalone_la_LIBADD = @APR_LDADD@ \
+    @APU_LDADD@ \
+    @LIBXML2_LDADD@ \
+    @LUA_LDADD@ \
+    @PCRE_LDADD@
 
 if AIX
 standalone_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if HPUX
 standalone_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if MACOSX
 standalone_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if SOLARIS
 standalone_la_LDFLAGS = -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if LINUX
 standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if FREEBSD
 standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if OPENBSD
 standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
 
 if NETBSD
 standalone_la_LDFLAGS = -no-undefined -module -avoid-version \
-                           @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                           @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@
+    @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 endif
-
-standalone_INCS = `echo "@LIBXML2_CFLAGS@ @LUA_CFLAGS@" | sed -n 's/ *-I *\([^ ]*\) /\1 /gp'` \ 
-				@APXS_INCLUDEDIR@ @APR_INCLUDEDIR@ @APU_INCLUDEDIR@
-standalone_LIBS = @APR_LINKLD@ @APU_LINKLD@ @APXS_LDFLAGS@ \
-             @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@
-install-exec-hook: $(pkglib_LTLIBRARIES)
-	@echo "Creating Nginx config file..."; \
-	rm -f ../nginx/modsecurity/config; \
-	echo "ngx_addon_name=ngx_http_modsecurity" >> ../nginx/modsecurity/config; \
-	echo "CORE_MODULES=\"\$$CORE_MODULES ngx_pool_context_module\"" >> ../nginx/modsecurity/config; \
-	echo "HTTP_AUX_FILTER_MODULES=\"ngx_http_modsecurity \$$HTTP_AUX_FILTER_MODULES\"" >> ../nginx/modsecurity/config; \
-	echo "NGX_ADDON_SRCS=\"\$$NGX_ADDON_SRCS \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config;\
-	echo "NGX_ADDON_DEPS=\"\$$NGX_ADDON_DEPS \$$ngx_addon_dir/apr_bucket_nginx.h \$$ngx_addon_dir/ngx_pool_context.h \$$ngx_addon_dir/ngx_http_modsecurity.c \$$ngx_addon_dir/apr_bucket_nginx.c \$$ngx_addon_dir/ngx_pool_context.c\"" >> ../nginx/modsecurity/config; \
-	echo "CORE_LIBS=\"\$$CORE_LIBS \$$ngx_addon_dir/../../standalone/.libs/standalone.a $(standalone_LIBS) \"" >> ../nginx/modsecurity/config; \
-	echo "CORE_INCS=\"\$$CORE_INCS \$$ngx_addon_dir \$$ngx_addon_dir/../../standalone \$$ngx_addon_dir/../../apache2 $(standalone_INCS)\"" >> ../nginx/modsecurity/config; \
-	echo "Removing unused static libraries..."; \
-	for m in $(pkglib_LTLIBRARIES); do \
-	  base=`echo $$m | sed 's/\..*//'`; \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \
-	  cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(APXS_MODULES); \
-	done
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51efc827..101a4882 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,43 +1,56 @@
 check_PROGRAMS = msc_test
 msc_test_SOURCES = msc_test.c \
-                   $(top_srcdir)/standalone/server.c \
-                   $(top_srcdir)/standalone/regex.c \
-                   $(top_srcdir)/apache2/re.c \
-                   $(top_srcdir)/apache2/re_operators.c \
-                   $(top_srcdir)/apache2/re_actions.c \
-                   $(top_srcdir)/apache2/re_tfns.c \
-                   $(top_srcdir)/apache2/re_variables.c \
-                   $(top_srcdir)/apache2/msc_logging.c \
-                   $(top_srcdir)/apache2/msc_xml.c \
-                   $(top_srcdir)/apache2/msc_multipart.c \
-                   $(top_srcdir)/apache2/modsecurity.c \
-                   $(top_srcdir)/apache2/msc_parsers.c \
-                   $(top_srcdir)/apache2/msc_util.c \
-                   $(top_srcdir)/apache2/msc_pcre.c \
-                   $(top_srcdir)/apache2/msc_unicode.c \
-                   $(top_srcdir)/apache2/persist_dbm.c \
-                   $(top_srcdir)/apache2/msc_reqbody.c \
-                   $(top_srcdir)/apache2/msc_crypt.c \
-                   $(top_srcdir)/apache2/msc_json.c \
-                   $(top_srcdir)/apache2/msc_tree.c \
-                   $(top_srcdir)/apache2/msc_geo.c \
-                   $(top_srcdir)/apache2/msc_gsb.c \
-                   $(top_srcdir)/apache2/acmp.c \
-                   $(top_srcdir)/apache2/msc_lua.c \
-                   $(top_srcdir)/apache2/msc_release.c \
-                   $(top_srcdir)/apache2/libinjection/libinjection_sqli.c
-msc_test_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \
-                  @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @LUA_CFLAGS@ \
-                  @YAJL_CFLAGS@ 
+    $(top_srcdir)/apache2/acmp.c \
+    $(top_srcdir)/apache2/libinjection/libinjection_sqli.c \
+    $(top_srcdir)/apache2/modsecurity.c \
+    $(top_srcdir)/apache2/msc_crypt.c \
+    $(top_srcdir)/apache2/msc_geo.c \
+    $(top_srcdir)/apache2/msc_gsb.c \
+    $(top_srcdir)/apache2/msc_logging.c \
+    $(top_srcdir)/apache2/msc_lua.c \
+    $(top_srcdir)/apache2/msc_multipart.c \
+    $(top_srcdir)/apache2/msc_parsers.c \
+    $(top_srcdir)/apache2/msc_pcre.c \
+    $(top_srcdir)/apache2/msc_release.c \
+    $(top_srcdir)/apache2/msc_reqbody.c \
+    $(top_srcdir)/apache2/msc_tree.c \
+    $(top_srcdir)/apache2/msc_unicode.c \
+    $(top_srcdir)/apache2/msc_util.c \
+    $(top_srcdir)/apache2/msc_xml.c \
+    $(top_srcdir)/apache2/persist_dbm.c \
+    $(top_srcdir)/apache2/re_actions.c \
+    $(top_srcdir)/apache2/re.c \
+    $(top_srcdir)/apache2/re_operators.c \
+    $(top_srcdir)/apache2/re_tfns.c \
+    $(top_srcdir)/apache2/re_variables.c \
+    $(top_srcdir)/standalone/regex.c \
+    $(top_srcdir)/standalone/server.c
+
+msc_test_CFLAGS = @APR_CFLAGS@ \
+    @APU_CFLAGS@ \
+    @APXS_CFLAGS@ \
+    @LIBXML2_CFLAGS@ \
+    @LUA_CFLAGS@ \
+    @MODSEC_EXTRA_CFLAGS@ \
+    @PCRE_CFLAGS@
+    
 msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
-                    @APR_CPPFLAGS@ @LIBXML2_CPPFLAGS@ \
-                    @PCRE_CPPFLAGS@
-msc_test_LDADD = @APR_LDADD@ @APU_LDADD@ \
-                 @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ \
-                 @YAJL_LDADD@ 
-msc_test_LDFLAGS = @APR_LDFLAGS@ @APU_LDFLAGS@ @APXS_LDFLAGS@ \
-                   @PCRE_LDFLAGS@ @LIBXML2_LDFLAGS@ @LUA_LDFLAGS@ \
-                   @YAJL_LDFLAGS@
+    @APR_CPPFLAGS@ \
+    @LIBXML2_CPPFLAGS@ \
+    @PCRE_CPPFLAGS@
+    
+msc_test_LDADD = @APR_LDADD@ \
+    @APU_LDADD@ \
+    @LIBXML2_LDADD@ \
+    @LUA_LDADD@ \
+    @PCRE_LDADD@
+
+msc_test_LDFLAGS = @APR_LDFLAGS@ \
+    @APU_LDFLAGS@ \
+    @APXS_LDFLAGS@ \
+    @LIBXML2_LDFLAGS@ \
+    @LUA_LDFLAGS@ \
+    @PCRE_LDFLAGS@
 
 check_SCRIPTS = run-unit-tests.pl
 TESTS = $(check_SCRIPTS)