diff --git a/history.txt b/history.txt
index 6d78d3e22..2a328d932 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,24 @@
+2021-03-16 zzz
+ * Console: Fix netdb SSU caps search
+ * Transports: Enable 4/6 caps
+
+2021-03-15 zzz
+ * SSU: Fix IPv6 addresses not being removed on some state transitions
+ * Util: Don't call out to InetAddress for IP parsing
+
+2021-03-13 zzz
+ * Console: Limit share to 90% max
+
+2021-03-11 zzz
+ * NetDB: Queue RI file deletion and delete in a single thread
+ * SSU: Limit port changes
+
+2021-03-09 zzz
+ * Throttle: Don't do exponential calculation unless necessary
+ * Util: Consolidate dup BandwidthEstimator interfaces
+
 2021-03-08 zzz
+ * NTCP: Remove NTCP 1 suppport
  * SSU: Increase CoDel drop threshold at UDPSender queue
 
 2021-03-06 zzz
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index f2424bd3b..707cdcd34 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 = "Git";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 6;
+    public final static long BUILD = 7;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 0ebafca8a..bcf55a522 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -74,7 +74,7 @@ public abstract class TransportImpl implements Transport {
     /** @since 0.9.50 */
     protected static final String PROP_TRANSPORT_CAPS = "i2np.transportCaps";
     /** @since 0.9.50 */
-    protected static final boolean ENABLE_TRANSPORT_CAPS = false;
+    protected static final boolean ENABLE_TRANSPORT_CAPS = true;
     /** @since 0.9.50 */
     public static final String CAP_IPV4 = "4";
     /** @since 0.9.50 */
diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
index 254fa9468..04afdbab7 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -1240,6 +1240,7 @@ public class NTCPTransport extends TransportImpl {
         // only set i if we are not firewalled
         if (props.containsKey("host")) {
             props.setProperty("i", _b64Ntcp2StaticIV);
+            props.remove("caps");
         } else if (_context.getProperty(PROP_TRANSPORT_CAPS, ENABLE_TRANSPORT_CAPS)) {
             String caps;
             TransportUtil.IPv6Config config = getIPv6Config();