diff --git a/VERSION b/VERSION
index e786178e..29eb108e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-21 18:20:02) dev
+Version 2.00.0 (2012-08-21 21:53:55) dev
diff --git a/gluon/rewrite.py b/gluon/rewrite.py
index 835fd287..72b7cb7f 100644
--- a/gluon/rewrite.py
+++ b/gluon/rewrite.py
@@ -476,7 +476,7 @@ def load_routers(all_apps):
 def regex_uri(e, regexes, tag, default=None):
     "filter incoming URI against a list of regexes"
     path = e['PATH_INFO']
-    host = e.get('HTTP_HOST', 'localhost').lower()
+    host = e.get('http_host', e.get('SERVER_NAME','localhost')).lower()    
     i = host.find(':')
     if i > 0:
         host = host[:i]