diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
index 7cd2c8cb7..4e25719a0 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
@@ -13,7 +13,7 @@ import java.util.TreeSet;
 
 import net.i2p.router.client.ClientManagerFacadeImpl;
 import net.i2p.router.startup.ClientAppConfig;
-import net.i2p.router.transport.Addresses;
+import net.i2p.util.Addresses;
 
 public class ConfigClientsHelper extends HelperBase {
     private String _edit;
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
index 512b51593..392b3c06b 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java
@@ -4,11 +4,11 @@ import net.i2p.data.DataHelper;
 import net.i2p.data.RouterAddress;
 import net.i2p.router.CommSystemFacade;
 import net.i2p.router.Router;
-import net.i2p.router.transport.Addresses;
 import net.i2p.router.transport.TransportManager;
 import net.i2p.router.transport.udp.UDPAddress;
 import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.time.Timestamper;
+import net.i2p.util.Addresses;
 
 public class ConfigNetHelper extends HelperBase {
     public ConfigNetHelper() {}
diff --git a/router/java/src/net/i2p/router/transport/Addresses.java b/core/java/src/net/i2p/util/Addresses.java
similarity index 98%
rename from router/java/src/net/i2p/router/transport/Addresses.java
rename to core/java/src/net/i2p/util/Addresses.java
index 5200e1173..b81d43c23 100644
--- a/router/java/src/net/i2p/router/transport/Addresses.java
+++ b/core/java/src/net/i2p/util/Addresses.java
@@ -1,4 +1,4 @@
-package net.i2p.router.transport;
+package net.i2p.util;
 
 /*
  * public domain
@@ -18,6 +18,7 @@ import java.util.Set;
 /**
  * Get the local addresses
  *
+ * @since 0.8.3 moved to core
  * @author zzz
  */
 public class Addresses {
diff --git a/router/java/src/net/i2p/router/transport/TransportManager.java b/router/java/src/net/i2p/router/transport/TransportManager.java
index cf21af11d..a682840b1 100644
--- a/router/java/src/net/i2p/router/transport/TransportManager.java
+++ b/router/java/src/net/i2p/router/transport/TransportManager.java
@@ -32,6 +32,7 @@ import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
 import net.i2p.router.transport.ntcp.NTCPTransport;
 import net.i2p.router.transport.udp.UDPTransport;
+import net.i2p.util.Addresses;
 import net.i2p.util.Log;
 import net.i2p.util.Translate;