diff --git a/.travis.yml b/.travis.yml
index 2a687a13b..6528f584e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ sudo: required
 language: go
 
 go:
-  - 1.4
-  - 1.5
+  - 1.7
   - tip
 
 matrix:
@@ -15,9 +14,9 @@ services:
   - docker
 
 before_install:
-- docker pull jbenet/go-ipfs:latest
+- docker pull ipfs/go-ipfs:master
 - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs
-- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 jbenet/go-ipfs
+- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master
 
 install:
   - go get -t -v ./...
diff --git a/shell.go b/shell.go
index 5b9a92ac2..acc62a569 100644
--- a/shell.go
+++ b/shell.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 	files "github.com/whyrusleeping/go-multipart-files"
 	tar "github.com/whyrusleeping/tar-utils"
 )