diff --git a/runtimes/google/ipc/stream/crypto/box.go b/runtimes/google/ipc/stream/crypto/box.go
index 24e6328..7f13e60 100644
--- a/runtimes/google/ipc/stream/crypto/box.go
+++ b/runtimes/google/ipc/stream/crypto/box.go
@@ -2,10 +2,10 @@
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/nacl/box"
 	"crypto/rand"
 	"encoding/binary"
 	"fmt"
+	"golang.org/x/crypto/nacl/box"
 	"io"
 	"net"
 	"veyron.io/veyron/veyron/runtimes/google/lib/iobuf"
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher.go b/runtimes/google/ipc/stream/crypto/box_cipher.go
index d1e4987..6174213 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher.go
@@ -4,8 +4,8 @@
 	"encoding/binary"
 	"errors"
 
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.crypto/salsa20/salsa"
+	"golang.org/x/crypto/nacl/box"
+	"golang.org/x/crypto/salsa20/salsa"
 )
 
 // cbox implements a ControlCipher using go.crypto/nacl/box.
diff --git a/runtimes/google/ipc/stream/crypto/box_cipher_test.go b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
index 795c9c3..acd26ae 100644
--- a/runtimes/google/ipc/stream/crypto/box_cipher_test.go
+++ b/runtimes/google/ipc/stream/crypto/box_cipher_test.go
@@ -5,7 +5,7 @@
 	"crypto/rand"
 	"testing"
 
-	"code.google.com/p/go.crypto/nacl/box"
+	"golang.org/x/crypto/nacl/box"
 
 	"veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
 )
diff --git a/runtimes/google/ipc/stream/vif/auth.go b/runtimes/google/ipc/stream/vif/auth.go
index 6a05496..bba4d16 100644
--- a/runtimes/google/ipc/stream/vif/auth.go
+++ b/runtimes/google/ipc/stream/vif/auth.go
@@ -7,7 +7,7 @@
 	"io"
 	"net"
 
-	"code.google.com/p/go.crypto/nacl/box"
+	"golang.org/x/crypto/nacl/box"
 
 	"veyron.io/veyron/veyron/runtimes/google/ipc/stream/crypto"
 	"veyron.io/veyron/veyron/runtimes/google/ipc/stream/message"
@@ -49,7 +49,7 @@
 //      pairs, sending the public key to the peer as a crypto option.  The
 //      remainder of the communication is encrypted as HopSetupStream messages
 //      using NewControlCipherIPC6, which is based on
-//      code.google.com/p/go.crypto/nacl/box.
+//      golang.org/x/crypto/nacl/box.
 //
 //    - Once the encrypted HopSetupStream channel is setup, the client and
 //      server authenticate using the vc.AuthenticateAs{Client,Server} protocol.
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index e76941e..1382cd4 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -8,7 +8,7 @@
 	"os/signal"
 	"syscall"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
+	"golang.org/x/crypto/ssh/terminal"
 
 	"veyron.io/veyron/veyron/lib/flags/consts"
 	_ "veyron.io/veyron/veyron/profiles"