diff --git a/history.txt b/history.txt
index 483cbd2c8..be994f858 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+2010-12-02 zzz
+    * Streaming: Restore I2PSocketManagerFull as public
+                 (broke jwebcahe ticket #345)
+    * Transport: Hamachi address block 5/8 assigned by IANA
+
 2010-12-01 dr|z3d
     * Console: 
       - Extensive reworking of ieshim.css for classic theme/Internet Explorer.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 5b1ba79e3..f5c926454 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 = 19;
+    public final static long BUILD = 20;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/Addresses.java b/router/java/src/net/i2p/router/transport/Addresses.java
index 5f2641b64..dab8cfc6d 100644
--- a/router/java/src/net/i2p/router/transport/Addresses.java
+++ b/router/java/src/net/i2p/router/transport/Addresses.java
@@ -66,6 +66,11 @@ public class Addresses {
             ia.isLoopbackAddress() ||
             ia.isMulticastAddress() ||
             ia.isSiteLocalAddress() ||
+            // Hamachi 5/8 allocated to RIPE (30 November 2010)
+            // Removed from TransportImpl.isPubliclyRoutable()
+            // Check moved to here, for now, but will eventually need to
+            // remove it from here also.
+            ia.getHostAddress().startsWith("5.") ||
             !(ia instanceof Inet4Address)) {
 //            System.err.println("Skipping: " + ia.getHostAddress());
             return;
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 77604083e..7ac7d05b2 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -583,7 +583,8 @@ public abstract class TransportImpl implements Transport {
             if ((addr[0]&0xFF) >= 224) return false; // no multicast
             if ((addr[0]&0xFF) == 0) return false;
             if ( ((addr[0]&0xFF) == 169) && ((addr[1]&0xFF) == 254) ) return false;
-            if ((addr[0]&0xFF) == 5) return false;  // Hamachi
+            // 5/8 allocated to RIPE (30 November 2010)
+            //if ((addr[0]&0xFF) == 5) return false;  // Hamachi
             return true; // or at least possible to be true
         } else if (addr.length == 16) {
             return false;