diff --git a/history.txt b/history.txt
index 08f537364c..8cef343395 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,48 @@
+2014-11-06 zzz
+Prop from i2p.i2p.zzz.test2:
+ * Blockfile:
+   - Add block size to superblock
+   - Add span size to skiplist block
+   - Bump version to 1.2
+ * Console:
+   - Log warnings for Java 6 or no Pack200
+   - Add ECDSA warning to sidebar
+   - Don't disable updates when restarting from /configupdate
+   - Recognize router.newsRefreshFrequency=0 as "never"
+ * Crypto: Drop dummy crypto stubs
+ * i2psnark:
+   - Convert '+' to ' ' in magnet dn param
+   - Fix NPE when deleting torrent if the data directory
+     was deleted out from under us (ticket #1407)
+   - Add new opentrackers, remove welterde
+   - Support multiple default opentrackers
+   - Don't link to opentrackers at the top
+ * i2ptunnel:
+   - ECDSA default for all new server tunnels
+   - ECDSA default for streamr client tunnels
+   - Fix display of server destination on edit page when not running (privkey file path wasn't absolute)
+   - Fix display of persistent client key b32 on edit page when not running
+   - Fix display of server sig type on edit page when we have a privkey file
+ * jbigi: Save and report extracted library name
+ * Reseed: SSL-only by default
+ * Router:
+   - Make recognition of a hidden router consistent,
+     whether specified in the caps or the cert
+   - Job Queue: Only drop lookup jobs if lagged
+ * SSU:
+   - Don't resend ACKS that are too old (ticket #772)
+   - Dont OOM if ACK sender dies
+   - Don't publish direct info if introducers are required
+ * SU3File: Show content and file types in showversion
+ * Transports:
+   - Consolidate port checking code
+   - Disallow SSDP port
+ * Update: Implement signed news in su3 format with trusted signers,
+   wrapping an Atom XML format
+ * Util:
+   - Use write-sync-close-rename for config file writing
+   - Null check in zip entry name
+
 2014-11-04 zzz
  * SSU: Fix corruption of ack-only packets containing bitfields
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 87e5bffca0..282c18b422 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 = 1;
+    public final static long BUILD = 2;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
index 88551d588c..691601933e 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPAddress.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import net.i2p.data.Base64;
 import net.i2p.data.router.RouterAddress;
 import net.i2p.data.SessionKey;
+import net.i2p.router.transport.TransportUtil;
 import net.i2p.util.LHMCache;
 import net.i2p.util.SystemVersion;
 
@@ -100,7 +101,7 @@ class UDPAddress {
             int p;
             try { 
                 p = Integer.parseInt(port); 
-                if (p < UDPTransport.MIN_PEER_PORT || p > 65535) continue;
+                if (!TransportUtil.isValidPort(p)) continue;
             } catch (NumberFormatException nfe) {
                 continue;
             }