diff --git a/README.md b/README.md
index 1b50081..a07e18a 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # multiaddr/net - Multiaddr friendly net
 
-Package multiaddr/net provides [Multiaddr](http://github.com/jbenet/go-multiaddr) specific versions of common
+Package multiaddr/net provides [Multiaddr](http://github.com/multiformats/go-multiaddr) specific versions of common
 functions in stdlib's net package. This means wrappers of
 standard net symbols like net.Dial and net.Listen, as well
 as conversion to/from net.Addr.
 
 Docs:
 
-- `multiaddr/net`: https://godoc.org/github.com/jbenet/go-multiaddr-net
-- `multiaddr`: https://godoc.org/github.com/jbenet/go-multiaddr
+- `multiaddr/net`: https://godoc.org/github.com/multiformats/go-multiaddr-net
+- `multiaddr`: https://godoc.org/github.com/multiformats/go-multiaddr
diff --git a/convert.go b/convert.go
index aa3bf5c..0dfc258 100644
--- a/convert.go
+++ b/convert.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"strings"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 var errIncorrectNetAddr = fmt.Errorf("incorrect network addr conversion")
diff --git a/convert_test.go b/convert_test.go
index 80fbfcc..1e88c29 100644
--- a/convert_test.go
+++ b/convert_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 type GenFunc func() (ma.Multiaddr, error)
diff --git a/ip.go b/ip.go
index f0536d4..71a2db6 100644
--- a/ip.go
+++ b/ip.go
@@ -3,7 +3,7 @@ package manet
 import (
 	"bytes"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // Loopback Addresses
diff --git a/multiaddr/multiaddr.go b/multiaddr/multiaddr.go
index 39f1ad5..5faf35f 100644
--- a/multiaddr/multiaddr.go
+++ b/multiaddr/multiaddr.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr-net"
 )
 
diff --git a/net.go b/net.go
index a52972a..fd39fc0 100644
--- a/net.go
+++ b/net.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 // Conn is the equivalent of a net.Conn object. It is the
diff --git a/net_test.go b/net_test.go
index 4ac4cd5..6b4351d 100644
--- a/net_test.go
+++ b/net_test.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func newMultiaddr(t *testing.T, m string) ma.Multiaddr {
diff --git a/package.json b/package.json
index bb2b2bb..58f0bd0 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,15 @@
 {
   "author": "jbenet",
   "bugs": {
-    "url": "https://github.com/jbenet/go-multiaddr-net"
+    "url": "https://github.com/multiformats/go-multiaddr-net"
   },
   "gx": {
-    "dvcsimport": "github.com/jbenet/go-multiaddr-net"
+    "dvcsimport": "github.com/multiformats/go-multiaddr-net"
   },
   "gxDependencies": [
     {
-      "author": "whyrusleeping",
-      "hash": "QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd",
+      "author": "multiformats",
+      "hash": "QmfZmQJ7J3MeBChAdcYfgDAWfbqjMU75bdLcmpD3TEhSZ1",
       "name": "go-multiaddr",
       "version": "0.0.0"
     }
diff --git a/registry.go b/registry.go
index f81f8aa..0b86c05 100644
--- a/registry.go
+++ b/registry.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"sync"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 type FromNetAddrFunc func(a net.Addr) (ma.Multiaddr, error)
diff --git a/registry_test.go b/registry_test.go
index 6e825e8..b3777ca 100644
--- a/registry_test.go
+++ b/registry_test.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/multiformats/go-multiaddr"
 )
 
 func TestRegisterSpec(t *testing.T) {