diff --git a/core/java/src/net/i2p/data/DataHelper.java b/core/java/src/net/i2p/data/DataHelper.java
index 9e159a5788..14f2d2f0bd 100644
--- a/core/java/src/net/i2p/data/DataHelper.java
+++ b/core/java/src/net/i2p/data/DataHelper.java
@@ -520,7 +520,7 @@ public class DataHelper {
     /**
      *  Hex without leading zeros.
      *  Use toString(byte[] to get leading zeros
-     *  @param buf may be null (returns "00")
+     *  @param data may be null (returns "00")
      */
     public final static String toHexString(byte data[]) {
         if ((data == null) || (data.length <= 0)) return "00";
diff --git a/core/java/src/net/i2p/util/I2PThread.java b/core/java/src/net/i2p/util/I2PThread.java
index 467fb5297a..477568f691 100644
--- a/core/java/src/net/i2p/util/I2PThread.java
+++ b/core/java/src/net/i2p/util/I2PThread.java
@@ -101,7 +101,6 @@ public class I2PThread extends Thread {
     }
     
 /****
-    @Override
     protected void finalize() throws Throwable {
         //log(Log.DEBUG, "Thread finalized: " + _name);
         super.finalize();
diff --git a/history.txt b/history.txt
index a7ca76565a..669d6cc337 100644
--- a/history.txt
+++ b/history.txt
@@ -4,6 +4,7 @@
    - Fix setting short retry time after initial announce failure
    - Fix DHT announce and getPeers
    - Fix DHT warning message
+ * UPnP: Update to CyberLink 2.1 (ticket #427, possibly others)
 
 2012-08-13 zzz
  * SSU EstablishmentManager:
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 7ca1a3ec2c..5a58b19bc2 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 = 10;
+    public final static long BUILD = 11;
 
     /** for example "-test" */
     public final static String EXTRA = "";