diff --git a/VERSION b/VERSION
index a39ba0ac..ab68522c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.2.1 (2012-10-25 10:02:32) stable
+Version 2.2.1 (2012-10-25 10:03:59) stable
diff --git a/gluon/rocket.py b/gluon/rocket.py
index c5dfff76..3f88f40b 100644
--- a/gluon/rocket.py
+++ b/gluon/rocket.py
@@ -1192,7 +1192,7 @@ re_REQUEST_LINE = re.compile(r"""^
     (?P<host>[^/]+)                                          # Host
 )? #
 (?P<path>(\*|/[^ \?]*))                                      # Path
-(\? (?P<query_string>[^ ]+))?                                # Query String
+(\? (?P<query_string>[^ ]*))?                                # Query String
 \                                                            # (single space)
 (?P<protocol>HTTPS?/1\.[01])                                 # Protocol
 $