diff --git a/ipam/allocate.go b/ipam/allocate.go
index 0e4a9e4b..f85c6579 100644
--- a/ipam/allocate.go
+++ b/ipam/allocate.go
@@ -3,7 +3,7 @@ package ipam
 import (
 	"fmt"
 
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 )
 
 type allocateResult struct {
diff --git a/ipam/allocator.go b/ipam/allocator.go
index a63ecb5b..50795d19 100644
--- a/ipam/allocator.go
+++ b/ipam/allocator.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
 	"github.com/weaveworks/weave/ipam/paxos"
 	"github.com/weaveworks/weave/ipam/ring"
 	"github.com/weaveworks/weave/ipam/space"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/allocator_test.go b/ipam/allocator_test.go
index 37802495..3c9075e1 100644
--- a/ipam/allocator_test.go
+++ b/ipam/allocator_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/claim.go b/ipam/claim.go
index 8d96e6e2..8b34812b 100644
--- a/ipam/claim.go
+++ b/ipam/claim.go
@@ -3,7 +3,7 @@ package ipam
 import (
 	"fmt"
 
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/http.go b/ipam/http.go
index 0b665385..1ea48c32 100644
--- a/ipam/http.go
+++ b/ipam/http.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/weaveworks/weave/common"
 	"github.com/weaveworks/weave/common/docker"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 )
 
 func badRequest(w http.ResponseWriter, err error) {
diff --git a/ipam/http_test.go b/ipam/http_test.go
index 97ce7a24..36183b56 100644
--- a/ipam/http_test.go
+++ b/ipam/http_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	wt "github.com/weaveworks/weave/testing"
 )
 
diff --git a/ipam/ring/entry.go b/ipam/ring/entry.go
index 358216ec..e33bd488 100644
--- a/ipam/ring/entry.go
+++ b/ipam/ring/entry.go
@@ -4,7 +4,7 @@ import (
 	"sort"
 
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/ring/ring.go b/ipam/ring/ring.go
index 2105939c..fbeeb21b 100644
--- a/ipam/ring/ring.go
+++ b/ipam/ring/ring.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/ring/ring_test.go b/ipam/ring/ring_test.go
index 852f060e..e29c3a5e 100644
--- a/ipam/ring/ring_test.go
+++ b/ipam/ring/ring_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/space/space.go b/ipam/space/space.go
index 1d912370..06e1bb34 100644
--- a/ipam/space/space.go
+++ b/ipam/space/space.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 )
 
 type Space struct {
diff --git a/ipam/space/space_test.go b/ipam/space/space_test.go
index 1a096fe3..7c17a3bc 100644
--- a/ipam/space/space_test.go
+++ b/ipam/space/space_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	wt "github.com/weaveworks/weave/testing"
 )
 
diff --git a/ipam/testutils_test.go b/ipam/testutils_test.go
index cab3daea..37855666 100644
--- a/ipam/testutils_test.go
+++ b/ipam/testutils_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/ipam/address"
+	"github.com/weaveworks/weave/net/address"
 	"github.com/weaveworks/weave/router"
 )
 
diff --git a/ipam/address/address.go b/net/address/address.go
similarity index 100%
rename from ipam/address/address.go
rename to net/address/address.go
diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index 4f4b68de..1b900003 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -15,8 +15,8 @@ import (
 	. "github.com/weaveworks/weave/common"
 	"github.com/weaveworks/weave/common/docker"
 	"github.com/weaveworks/weave/ipam"
-	"github.com/weaveworks/weave/ipam/address"
 	weavenet "github.com/weaveworks/weave/net"
+	"github.com/weaveworks/weave/net/address"
 	weave "github.com/weaveworks/weave/router"
 )