diff --git a/history.txt b/history.txt
index 0103cec11..545318adb 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,10 @@
+2018-07-04 zzz
+ * NTCP: Don't advertise interface address when configured for force-firewalled
+
 2018-07-01 zzz
+ * Build: Move Jetty/Tomcat version properties to top-level build.xml
  * Crypto: Backport EdDSA versions 0.2/0.3 from github
+ * NTCP2: Adjust padding defaults and size calculation
 
 2018-06-30 zzz
   * Console: Fix reading flags when symlinked (ticket #2270)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 0725033fa..f6e6df3a5 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 = 3;
+    public final static long BUILD = 4;
 
     /** 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 5853ecc23..1fcf0439c 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -83,7 +83,7 @@ public abstract class TransportImpl implements Transport {
      */
     public TransportImpl(RouterContext context) {
         _context = context;
-        _log = _context.logManager().getLog(TransportImpl.class);
+        _log = _context.logManager().getLog(getClass());
 
         _context.statManager().createRateStat("transport.sendMessageFailureLifetime", "How long the lifetime of messages that fail are?", "Transport", new long[] { 60*1000l, 10*60*1000l, 60*60*1000l, 24*60*60*1000l });
         _context.statManager().createRequiredRateStat("transport.sendMessageSize", "Size of sent messages (bytes)", "Transport", new long[] { 60*1000l, 5*60*1000l, 60*60*1000l, 24*60*60*1000l });
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 407b57458..ade45ee68 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java
@@ -402,7 +402,8 @@ public class NTCPTransport extends TransportImpl {
                     con.close();
                     afterSend(msg, false);
                 } catch (IllegalStateException ise) {
-                    _log.error("Failed opening a channel", ise);
+                    if (_log.shouldWarn())
+                        _log.warn("Failed opening a channel", ise);
                     afterSend(msg, false);
                 }
             } else {
@@ -771,6 +772,8 @@ public class NTCPTransport extends TransportImpl {
         else
             // received by externalAddressReceived() from TransportManager
             port = _ssuPort;
+        boolean isFixedOrForceFirewalled = _context.getProperty(PROP_I2NP_NTCP_AUTO_IP, "true")
+                                           .toLowerCase(Locale.US).equals("false");
         RouterAddress myAddress = bindAddress(port);
         if (myAddress != null) {
             // fixed interface, or bound to the specified host
@@ -778,7 +781,7 @@ public class NTCPTransport extends TransportImpl {
         } else if (addr != null) {
             // specified host, bound to wildcard
             replaceAddress(addr);
-        } else if (port > 0) {
+        } else if (port > 0 && !isFixedOrForceFirewalled) {
             // all detected interfaces
             Collection<InetAddress> addrs = getSavedLocalAddresses();
             if (!addrs.isEmpty()) {