diff --git a/history.txt b/history.txt
index 6838663283..ff522acbd5 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,7 @@
+2009-04-17 sponge
+    * fixed setIP, just be sure to distclean before building :-)
+    * more lint taken care of as well.
+
 2009-04-17 sponge
     * setIP wants to be a static method in the class, but it produces
       warnings about it being static from other code.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index d0a0103dbb..eb14294833 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -17,7 +17,7 @@
 public class RouterVersion {
     public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 20;
+    public final static long BUILD = 21;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/transport/TransportImpl.java b/router/java/src/net/i2p/router/transport/TransportImpl.java
index 51d84046ce..48864d3efc 100644
--- a/router/java/src/net/i2p/router/transport/TransportImpl.java
+++ b/router/java/src/net/i2p/router/transport/TransportImpl.java
@@ -505,7 +505,7 @@ public void markWasUnreachable(Hash peer, boolean yes) {
             _log.warn(this.getStyle() + " setting wasUnreachable to " + yes + " for " + peer);
     }
 
-    public static void setIP(Hash peer, byte[] ip) {
+    public /* static */ void setIP(Hash peer, byte[] ip) {
         _IPMap.put(peer, ip);
     }
 
diff --git a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
index c5b654b905..e8731da05f 100644
--- a/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
+++ b/router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
@@ -37,15 +37,15 @@ public class EstablishmentManager {
     private UDPTransport _transport;
     private PacketBuilder _builder;
     /** map of RemoteHostId to InboundEstablishState */
-    private Map _inboundStates;
+    private final Map _inboundStates;
     /** map of RemoteHostId to OutboundEstablishState */
-    private Map _outboundStates;
+    private final Map _outboundStates;
     /** map of RemoteHostId to List of OutNetMessage for messages exceeding capacity */
-    private Map _queuedOutbound;
+    private final Map _queuedOutbound;
     /** map of nonce (Long) to OutboundEstablishState */
-    private Map _liveIntroductions;
+    private final Map _liveIntroductions;
     private boolean _alive;
-    private Object _activityLock;
+    private final Object _activityLock;
     private int _activity;
     
     private static final int DEFAULT_MAX_CONCURRENT_ESTABLISH = 10;