diff --git a/CHANGES b/CHANGES
index 88f38573..a7e7b9d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+23 Jan 2008 - 2.1.6-rc1
+-----------------------
+
+ * No longer log the query portion of the URI in the error log as
+   it may contain sensitive data.
+
+
 10 Jan 2008 - 2.1.5
 -------------------
 
diff --git a/apache2/apache2_util.c b/apache2/apache2_util.c
index e3493c0a..602376fc 100644
--- a/apache2/apache2_util.c
+++ b/apache2/apache2_util.c
@@ -230,7 +230,7 @@ void internal_log(request_rec *r, directory_config *dcfg, modsec_rec *msr,
 
         ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, 0, r->server,
             "[client %s] ModSecurity: %s%s [uri \"%s\"]%s", r->connection->remote_ip, str1,
-            hostname, log_escape(msr->mp, r->unparsed_uri), unique_id);
+            hostname, log_escape(msr->mp, r->uri), unique_id);
 
         /* Add this message to the list. */
         if (msr != NULL) {