diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go
index c896d872..d110088b 100644
--- a/prog/weaveproxy/main.go
+++ b/prog/weaveproxy/main.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 
-	"code.google.com/p/getopt"
+	"github.com/pborman/getopt"
 	. "github.com/weaveworks/weave/common"
 	"github.com/weaveworks/weave/proxy"
 )
diff --git a/router/crypto.go b/router/crypto.go
index 291603d1..b66d2b73 100644
--- a/router/crypto.go
+++ b/router/crypto.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"sync"
 
-	"code.google.com/p/go-bit/bit"
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.crypto/nacl/secretbox"
+	"github.com/andybalholm/go-bit"
+	"golang.org/x/crypto/nacl/box"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 func GenerateKeyPair() (publicKey, privateKey *[32]byte, err error) {