diff --git a/ChangeLog b/ChangeLog
index e13e753bc503ea9142d11d95ec248381336c2dfd..b2387e117a021573949771b7b7208207df630d36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes in version 0.0.4 - UNRELEASED
  - Improve the runtime performance of the obfs4 handshake tests.
+ - Changed the go.crypto import path to the new location (golang.org/x/crypto).
 
 Changes in version 0.0.3 - 2014-10-01
  - Change the obfs4 bridge line format to use a "cert" argument instead of the
diff --git a/README.md b/README.md
index 40d092dfa9a60d1687877f879ceb297a5cbe98f0..e4d4595ffa88af4ed19dbc0e5ef0ea765e56fc2d 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ listed for clarity.
 
  * Go 1.2.0 or later.   Prior versions of Go (Eg: 1.0.2) are missing certain
    important parts of the runtime library like a SHA256 implementation.
- * go.crypto (https://code.google.com/p/go.crypto)
+ * go.crypto (https://golang.org/x/crypto)
  * go.net (https://code.google.com/p/go.net)
  * ed25519/extra25519 (https://github.com/agl/ed25519/extra25519)
  * SipHash-2-4 (https://github.com/dchest/siphash)
diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
index d123f3826fa99c109df0df2deb8b7ff7a966907f..f17e4646b330c6a6c67a242ae1e2bc91a55016ee 100644
--- a/common/ntor/ntor.go
+++ b/common/ntor/ntor.go
@@ -43,8 +43,8 @@ import (
 	"fmt"
 	"io"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/hkdf"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/hkdf"
 
 	"github.com/agl/ed25519/extra25519"
 
diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
index 04e788fe87baae2bc3eb21c07933a1493f2eceaa..879765d04dfa84f58d49f84c890839dd03f24291 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4/framing/framing.go
@@ -67,7 +67,7 @@ import (
 	"fmt"
 	"io"
 
-	"code.google.com/p/go.crypto/nacl/secretbox"
+	"golang.org/x/crypto/nacl/secretbox"
 
 	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
 	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"