diff --git a/history.txt b/history.txt
index 453ff76fc5..a219a8e611 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2012-07-28 zzz
+ * Addresses: Treat RFC 4193 addresses fc00::/7 as local
+ * NetDB: Disable RI verifies for now
+
+2012-07-26 zzz
+ * Transports:
+   - Fix IPv6-only option 2nd try
+   - Treat RFC 4193 addresses fc00::/7 as local
+
 2012-07-25 zzz
  * Transports:
    - Prefer IPv6 by default
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e36cd3b143..7f4edb9752 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 = 12;
+    public final static long BUILD = 13;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
index 34987aa5ee..363c748e89 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
@@ -24,6 +24,8 @@ import net.i2p.util.Log;
 class FloodfillStoreJob extends StoreJob {    
     private final FloodfillNetworkDatabaseFacade _facade;
 
+    private static final String PROP_RI_VERIFY = "router.verifyRouterInfoStore";
+
     /**
      * Send a data structure to the floodfills
      * 
@@ -64,6 +66,10 @@ class FloodfillStoreJob extends StoreJob {
             // it finds something stamped with that time or newer.
             DatabaseEntry data = _state.getData();
             boolean isRouterInfo = data.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO;
+            // default false
+            if (isRouterInfo && !getContext().getBooleanProperty(PROP_RI_VERIFY))
+                return;
+
             long published = data.getDate();
 
             // we should always have exactly one successful entry