diff --git a/VERSION b/VERSION
index cee3f88c..f31afd5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-26 09:41:33) dev
+Version 2.00.0 (2012-07-26 17:37:45) dev
diff --git a/gluon/widget.py b/gluon/widget.py
index 03e67eda..ce204a53 100644
--- a/gluon/widget.py
+++ b/gluon/widget.py
@@ -223,7 +223,10 @@ class web2pyDialog(object):
         self.ips = {}
         self.selected_ip = Tkinter.StringVar()
         row=0
-        for ip,legend in (('127.0.0.1','Local'),('0.0.0.0','Public')):
+        ips = [('127.0.0.1','Local')] + \
+            [(ip,'Public') for ip in options.ips] + \
+            [('0.0.0.0','Public')]
+        for ip,legend in ips:
             self.ips[ip] = Tkinter.Radiobutton(
                 self.root,text='%s (%s)' % (legend,ip),
                 variable=self.selected_ip, value=ip)
@@ -797,6 +800,9 @@ def console():
     global_settings.cmd_options = options
     global_settings.cmd_args = args
 
+    options.ips = [ip for ip in socket.gethostbyname_ex(socket.getfqdn())[2]
+                   if ip!='127.0.0.1']
+
     if options.run_system_tests:
         run_system_tests()