diff --git a/router/java/src/net/i2p/router/CommandLine.java b/router/java/src/net/i2p/router/CommandLine.java
index 8a3986d86dd779f44b2d82f891396b22eed9a8ac..c3af8d7381c085b96e9bf4c449308d5d57cb83b3 100644
--- a/router/java/src/net/i2p/router/CommandLine.java
+++ b/router/java/src/net/i2p/router/CommandLine.java
@@ -23,7 +23,7 @@ public class CommandLine extends net.i2p.util.CommandLine {
         "net.i2p.router.tasks.CryptoChecker",
         "net.i2p.router.transport.GeoIPv6",
         "net.i2p.router.transport.udp.MTU",
-        //"net.i2p.router.transport.UPnP"
+        "net.i2p.router.transport.UPnP"
     });
 
     protected CommandLine() {}
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 1f30c768c1e3b34718853707d054187743a05386..52637cec9603ee78f7fd480c97a99e51138925b5 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -58,6 +58,8 @@ import org.freenetproject.ForwardPortStatus;
  *
  * some code has been borrowed from Limewire : @see com.limegroup.gnutella.UPnPManager
  *
+ * Public only for command line usage. Not a public API, not for external use.
+ *
  * @see "http://www.upnp.org/"
  * @see "http://en.wikipedia.org/wiki/Universal_Plug_and_Play"
  * @since 0.7.4
@@ -68,7 +70,7 @@ import org.freenetproject.ForwardPortStatus;
  * TODO: Advertise the node like the MDNS plugin does
  * TODO: Implement EventListener and react on ip-change
  */ 
-class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
+public class UPnP extends ControlPoint implements DeviceChangeListener, EventListener {
 	private final Log _log;
 	private final I2PAppContext _context;