diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
index 896b8b200..541f6d73c 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java
@@ -145,7 +145,10 @@ public class ConfigNetHandler extends FormHandler {
                 }
                 _context.router().setConfigSetting(UDPTransport.PROP_SOURCES, _udpAutoIP);
                 // Todo: Catch local IPs right here rather than complaining later
-                _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost);
+                if (uhost.length() > 0)
+                    _context.router().setConfigSetting(UDPTransport.PROP_EXTERNAL_HOST, uhost);
+                else
+                    _context.router().removeConfigSetting(UDPTransport.PROP_EXTERNAL_HOST);
                 if ((!oldUdp.equals(_udpAutoIP)) || (!oldUHost.equals(uhost))) {
                    addFormNotice(_("Updating IP address"));
                    restartRequired = true;
diff --git a/history.txt b/history.txt
index 3257e7644..e3515e597 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,11 @@
+2010-06-02 zzz
+    * graphs.jsp: Tag some more
+    * Translation: Set xgettext add-comments option
+    * UDP: Fix a bug from a blank i2np.udp.host config
+      causing frequent RouterInfo updates and incorrect
+      addition of introducers, caused by config.jsp handling
+    * Update: Change default update URLs to .su2 for pack200
+
 2010-06-01 zzz
     * i2psnark:
       - More listing fixes
@@ -40,7 +48,7 @@
 
 2010-05-19 zzz
     * Data: Remove lots of unnecessary initializers
-    * susidns: More validataion when adding entry
+    * susidns: More validatation when adding entry
 
 2010-05-15 zzz
     * Console:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 25340f779..421ff4f63 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 15;
+    public final static long BUILD = 16;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index eb3cc53f5..88d57877b 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1181,7 +1181,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
     }
     
     private boolean explicitAddressSpecified() {
-        return (_context.getProperty(PROP_EXTERNAL_HOST) != null);
+        String h = _context.getProperty(PROP_EXTERNAL_HOST);
+        // Bug in config.jsp prior to 0.7.14, sets an empty host config
+        return h != null && h.length() > 0;
     }
     
     /**