diff --git a/Makefile.am b/Makefile.am
index 407a5374..e8fd806e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,34 @@
 ACLOCAL_AMFLAGS = -I build
 SUBDIRS = @TOPLEVEL_SUBDIRS@ tests
 
+CLEANFILES =
+MAINTAINERCLEANFILES =
+
+CLEANFILES += tests/regression/server_root/conf/*.t_*.conf \
+   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~ \
+       tests/Makefile.in \
+       tools/Makefile.in
+
 # Alias for "check"
 test: check
 
diff --git a/apache2/msc_logging.c b/apache2/msc_logging.c
index 81c52120..4770ccf4 100644
--- a/apache2/msc_logging.c
+++ b/apache2/msc_logging.c
@@ -1085,7 +1085,7 @@ void sec_audit_logger(modsec_rec *msr) {
         for(i = 0; i < msr->matched_rules->nelts; i++) {
             rule = ((msre_rule **)msr->matched_rules->elts)[i];
             if ((rule != NULL) && (rule->actionset != NULL) && rule->actionset->is_chained && (rule->chain_starter == NULL)) {
-                text = apr_psprintf(msr->mp, "Chain Starter [Match]: %s\n", rule->unparsed);
+                text = apr_psprintf(msr->mp, "%s\n", rule->unparsed);
                 sec_auditlog_write(msr, text, strlen(text));
                 do {
                     if (rule->ruleset != NULL)   {
@@ -1097,9 +1097,9 @@ void sec_audit_logger(modsec_rec *msr) {
                             present = chained_is_matched(msr,next_rule);
 
                             if (present == 0)   {
-                                text = apr_psprintf(msr->mp, "Chain node [No Match]: %s\n",next_rule->unparsed);
+                                text = apr_psprintf(msr->mp, "#%s\n",next_rule->unparsed);
                             } else  {
-                                text = apr_psprintf(msr->mp, "Chain node [Match]: %s\n",next_rule->unparsed);
+                                text = apr_psprintf(msr->mp, "%s\n",next_rule->unparsed);
                                 i++;
                             }
 
@@ -1112,7 +1112,7 @@ void sec_audit_logger(modsec_rec *msr) {
                 sec_auditlog_write(msr, text, strlen(text));
             } else  {
                 if ((rule != NULL) && (rule->actionset != NULL) && !rule->actionset->is_chained && (rule->chain_starter == NULL)) {
-                    text = apr_psprintf(msr->mp, "Rule [Match]: %s\n\n", rule->unparsed);
+                    text = apr_psprintf(msr->mp, "%s\n\n", rule->unparsed);
                     sec_auditlog_write(msr, text, strlen(text));
                 }
             }