diff --git a/CHANGES b/CHANGES
index f8be0da3..0d809837 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 21 Oct 2009 - trunk
 -------------------
 
+ * Do not escape quotes in macro resolution and only escape NUL in setenv
+   values.
+
  * Cleanup build files that were from the Apache source.
 
 
diff --git a/apache2/msc_util.c b/apache2/msc_util.c
index 15120401..7a8ab012 100644
--- a/apache2/msc_util.c
+++ b/apache2/msc_util.c
@@ -516,6 +516,27 @@ char *log_escape_raw(apr_pool_t *mp, const unsigned char *text, unsigned long in
     return (char *)ret;
 }
 
+char *log_escape_nul(apr_pool_t *mp, const unsigned char *text, unsigned long int text_length) {
+    unsigned char *ret = apr_palloc(mp, text_length * 4 + 1);
+    unsigned long int i, j;
+
+    for (i = 0, j = 0; i < text_length; i++) {
+        if (text[i] == '\0') {
+            ret[j] = '\\';
+            ret[j+1] = 'x';
+            c2x(text[i], ret+j+2);
+            j += 4;
+        }
+        else {
+            ret[j] = text[i];
+            j++;
+        }
+    }
+    ret[j] = '\0';
+
+    return (char *)ret;
+}
+
 /**
  * Transform text to ASCII printable or hex escaped
  */
diff --git a/apache2/msc_util.h b/apache2/msc_util.h
index f91ec3ae..8bed805e 100644
--- a/apache2/msc_util.h
+++ b/apache2/msc_util.h
@@ -78,6 +78,8 @@ char DSOLOCAL *log_escape_hex(apr_pool_t *mp, const unsigned char *text, unsigne
 
 char DSOLOCAL *log_escape_raw(apr_pool_t *mp, const unsigned char *text, unsigned long int text_length);
 
+char DSOLOCAL *log_escape_nul(apr_pool_t *mp, const unsigned char *text, unsigned long int text_length);
+
 char DSOLOCAL *_log_escape(apr_pool_t *p, const unsigned char *input,
     unsigned long int input_length, int escape_quotes, int escape_colon);
 
diff --git a/apache2/re_actions.c b/apache2/re_actions.c
index db94ef23..934a9c7b 100644
--- a/apache2/re_actions.c
+++ b/apache2/re_actions.c
@@ -245,11 +245,11 @@ int expand_macros(modsec_rec *msr, msc_string *var, msre_rule *rule, apr_pool_t
                         part->value = (char *)var_generated->value;
                         *(msc_string **)apr_array_push(arr) = part;
                         if (msr->txcfg->debuglog_level >= 9) {
-                            msr_log(msr, 9, "Resolved macro %%{%s%s%s} to \"%s\"",
+                            msr_log(msr, 9, "Resolved macro %%{%s%s%s} to: %s",
                                 var_name,
                                 (var_value ? "." : ""),
                                 (var_value ? var_value : ""),
-                                log_escape_ex(mptmp, part->value, part->value_len));
+                                log_escape_nq_ex(mptmp, part->value, part->value_len));
                         }
                     }
                 } else {
@@ -1128,7 +1128,7 @@ static apr_status_t msre_action_setenv_execute(modsec_rec *msr, apr_pool_t *mptm
     env->value = env_name;
     env->value_len = strlen(env->value);
     expand_macros(msr, env, rule, mptmp);
-    env_name = log_escape_ex(msr->mp, env->value, env->value_len);
+    env_name = log_escape_nq_ex(msr->mp, env->value, env->value_len);
 
     /* Execute the requested action. */
     if (env_name[0] == '!') {
@@ -1152,15 +1152,15 @@ static apr_status_t msre_action_setenv_execute(modsec_rec *msr, apr_pool_t *mptm
         val->value_len = strlen(val->value);
         expand_macros(msr, val, rule, mptmp);
 
-        /* To be safe, we escape the value as it goes in subprocess_env. */
-        val_value = log_escape_ex(msr->mp, val->value, val->value_len);
+        /* To be safe, we escape NULs as it goes in subprocess_env. */
+        val_value = log_escape_nul(msr->mp, (const unsigned char *)val->value, val->value_len);
 
         apr_table_set(msr->r->subprocess_env, env_name, val_value);
 
         if (msr->txcfg->debuglog_level >= 9) {
-            msr_log(msr, 9, "Set env variable \"%s\" to \"%s\".",
+            msr_log(msr, 9, "Set env variable \"%s\" to: %s",
                 env_name,
-                log_escape(mptmp, val_value));
+                log_escape_nq(mptmp, val_value));
         }
     }
 
@@ -1206,7 +1206,7 @@ static apr_status_t msre_action_setvar_execute(modsec_rec *msr, apr_pool_t *mptm
     var->value = var_name;
     var->value_len = strlen(var->value);
     expand_macros(msr, var, rule, mptmp);
-    var_name = log_escape_ex(msr->mp, var->value, var->value_len);
+    var_name = log_escape_nq_ex(msr->mp, var->value, var->value_len);
 
     /* Handle the exclamation mark. */
     if (var_name[0] == '!') {
@@ -1370,7 +1370,7 @@ static apr_status_t msre_action_expirevar_execute(modsec_rec *msr, apr_pool_t *m
     var->value = var_name;
     var->value_len = strlen(var->value);
     expand_macros(msr, var, rule, mptmp);
-    var_name = log_escape_ex(msr->mp, var->value, var->value_len);
+    var_name = log_escape_nq_ex(msr->mp, var->value, var->value_len);
 
     /* Choose the collection to work with. */
     s = strstr(var_name, ".");
@@ -1461,7 +1461,7 @@ static apr_status_t msre_action_deprecatevar_execute(modsec_rec *msr, apr_pool_t
     var->value = var_name;
     var->value_len = strlen(var->value);
     expand_macros(msr, var, rule, mptmp);
-    var_name = log_escape_ex(msr->mp, var->value, var->value_len);
+    var_name = log_escape_nq_ex(msr->mp, var->value, var->value_len);
 
     /* Expand macros in value */
     var->value = var_value;