diff --git a/CHANGES b/CHANGES
index bd7c598a..552742de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
 
-?? ??? 2007 - ?????
--------------------
+01 Mar 2007 - 2.1.1-dev1
+------------------------
 
-* Fixed the date on the 2.1.0 release from 2006 to 2007 below.
+* Fixed the faulty REQUEST_FILENAME variable, which used to change
+  the internal Apache structures by mistake.
 
-* Fixed some casting issues for compiling on NetWare (patch from Guenter_Knauf).
+* Fixed some casting issues for compiling on NetWare (patch from Guenter Knauf).
 
 * Updates to quiet some compiler warnings.
 
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index 7c170f23..59c76ed7 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -50,7 +50,7 @@ typedef struct msc_string msc_string;
 #include "http_protocol.h"
 
 #define MODULE_NAME "ModSecurity"
-#define MODULE_RELEASE "2.1.0"
+#define MODULE_RELEASE "2.1.1-dev1"
 #define MODULE_NAME_FULL (MODULE_NAME " v" MODULE_RELEASE " (Apache 2.x)")
 
 #define PHASE_REQUEST_HEADERS       1
diff --git a/apache2/re_variables.c b/apache2/re_variables.c
index 2e131ca9..9a9b85ad 100644
--- a/apache2/re_variables.c
+++ b/apache2/re_variables.c
@@ -1359,14 +1359,7 @@ static int var_request_headers_names_generate(modsec_rec *msr, msre_var *var, ms
 static int var_request_filename_generate(modsec_rec *msr, msre_var *var, msre_rule *rule,
     apr_table_t *vartab, apr_pool_t *mptmp)
 {
-    char *value = msr->r->parsed_uri.path;
-
-    if (value != NULL) {
-        int invalid_count = 0;
-        urldecode_nonstrict_inplace_ex((unsigned char *)value, strlen(value), &invalid_count);
-    }
-
-    return var_simple_generate(var, vartab, mptmp, value);
+    return var_simple_generate(var, vartab, mptmp, msr->r->parsed_uri.path);
 }
 
 /* REQUEST_LINE */