diff --git a/VERSION b/VERSION
index a8f1928d..bffc564b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-17 23:35:00) dev
+Version 2.00.0 (2012-06-17 23:36:32) dev
diff --git a/gluon/tools.py b/gluon/tools.py
index aa6549ff..b9cebe12 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -3567,13 +3567,12 @@ def fetch(url, data=None, headers=None,
     return html
 
 regex_geocode = \
-    re.compile('\<coordinates\>(?P<la>[^,]*),(?P<lo>[^,]*).*?\</coordinates\>')
-
+    re.compile(r"""<geometry>[\W]*?<location>[\W]*?<lat>(?P<la>[^<]*)</lat>[\W]*?<lng>(?P<lo>[^<]*)</lng>[\W]*?</location>""")
 
 def geocode(address):
     try:
         a = urllib.quote(address)
-        txt = fetch('http://maps.google.com/maps/geo?q=%s&output=xml'
+        txt = fetch('http://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address=%s'
                      % a)
         item = regex_geocode.search(txt)
         (la, lo) = (float(item.group('la')), float(item.group('lo')))