diff --git a/VERSION b/VERSION
index 94a27c75..6e6fcbfa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.08.21.17.26.48
+Version 2.6.0-development+timestamp.2013.08.22.02.18.31
diff --git a/gluon/globals.py b/gluon/globals.py
index 4413717a..4cc1b388 100644
--- a/gluon/globals.py
+++ b/gluon/globals.py
@@ -196,8 +196,11 @@ class Request(Storage):
         if (body and
                 env.request_method in ('POST', 'PUT', 'DELETE', 'BOTH') and
                 not is_json):
+            query_string = env.pop('QUERY_STRING') if 'QUERY_STRING' in env else None
             dpost = cgi.FieldStorage(fp=body, environ=env, keep_blank_values=1)
             post_vars.update(dpost)
+            if query_string is not None:
+                env['QUERY_STRING'] = query_string
             # The same detection used by FieldStorage to detect multipart POSTs
             is_multipart = dpost.type[:10] == 'multipart/'
             body.seek(0)