diff --git a/http2/README b/http2/README
index 16cb516a..3de57ded 100644
--- a/http2/README
+++ b/http2/README
@@ -10,7 +10,7 @@ Status:
 * The client work has just started but shares a lot of code
   is coming along much quicker.
 
-Docs are at https://godoc.org/github.com/bradfitz/http2
+Docs are at https://godoc.org/golang.org/x/net/http2
 
 Demo test server at https://http2.golang.org/
 
diff --git a/http2/h2demo/h2demo.go b/http2/h2demo/h2demo.go
index de6caaa7..b5ee4b24 100644
--- a/http2/h2demo/h2demo.go
+++ b/http2/h2demo/h2demo.go
@@ -31,7 +31,7 @@ import (
 
 	"camlistore.org/pkg/googlestorage"
 	"camlistore.org/pkg/singleflight"
-	"github.com/bradfitz/http2"
+	"golang.org/x/net/http2"
 )
 
 var (
@@ -51,7 +51,7 @@ func homeOldHTTP(w http.ResponseWriter, r *http.Request) {
    <li>Use Firefox Nightly or go to <b>about:config</b> and enable "network.http.spdy.enabled.http2draft"</li>
    <li>Use Google Chrome Canary and/or go to <b>chrome://flags/#enable-spdy4</b> to <i>Enable SPDY/4</i> (Chrome's name for HTTP/2)</li>
 </ul>
-<p>See code & instructions for connecting at <a href="https://github.com/bradfitz/http2">https://github.com/bradfitz/http2</a>.</p>
+<p>See code & instructions for connecting at <a href="https://github.com/golang/net/tree/master/http2">https://github.com/golang/net/tree/master/http2</a>.</p>
 
 </body></html>`)
 }
@@ -73,12 +73,12 @@ href="https://http2.github.io/">HTTP/2</a> demo & interop server.</p>
 <p>This server exists for others in the HTTP/2 community to test their HTTP/2 client implementations and point out flaws in our server.</p>
 
 <p> The code is currently at <a
-href="https://github.com/bradfitz/http2">github.com/bradfitz/http2</a>
+href="https://golang.org/x/net/http2">github.com/bradfitz/http2</a>
 but will move to the Go standard library at some point in the future
 (enabled by default, without users needing to change their code).</p>
 
 <p>Contact info: <i>bradfitz@golang.org</i>, or <a
-href="https://github.com/bradfitz/http2/issues">file a bug</a>.</p>
+href="https://golang.org/x/net/http2/issues">file a bug</a>.</p>
 
 <h2>Handlers for testing</h2>
 <ul>
diff --git a/http2/h2i/README.md b/http2/h2i/README.md
index 3ceecb7d..fb5c5efb 100644
--- a/http2/h2i/README.md
+++ b/http2/h2i/README.md
@@ -25,7 +25,7 @@ Later:
 ## Installation
 
 ```
-$ go get github.com/bradfitz/http2/h2i
+$ go get golang.org/x/net/http2/h2i
 $ h2i <host>
 ```
 
diff --git a/http2/h2i/h2i.go b/http2/h2i/h2i.go
index 67b874d6..307b3b93 100644
--- a/http2/h2i/h2i.go
+++ b/http2/h2i/h2i.go
@@ -36,8 +36,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/bradfitz/http2"
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/hpack"
 	"golang.org/x/crypto/ssh/terminal"
 )
 
diff --git a/http2/http2_test.go b/http2/http2_test.go
index 6a1b7e83..55407d66 100644
--- a/http2/http2_test.go
+++ b/http2/http2_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2/hpack"
 )
 
 var knownFailing = flag.Bool("known_failing", false, "Run known-failing tests.")
diff --git a/http2/server.go b/http2/server.go
index aa0e7bdc..99cc673c 100644
--- a/http2/server.go
+++ b/http2/server.go
@@ -55,7 +55,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2/hpack"
 )
 
 const (
diff --git a/http2/server_test.go b/http2/server_test.go
index 1133223b..5876a6af 100644
--- a/http2/server_test.go
+++ b/http2/server_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2/hpack"
 )
 
 var stderrVerbose = flag.Bool("stderr_verbose", false, "Mirror verbosity to stderr, unbuffered")
diff --git a/http2/transport.go b/http2/transport.go
index ea62188d..4e2518e7 100644
--- a/http2/transport.go
+++ b/http2/transport.go
@@ -19,7 +19,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2/hpack"
 )
 
 type Transport struct {
diff --git a/http2/write.go b/http2/write.go
index 7b9bdd3a..02f0743d 100644
--- a/http2/write.go
+++ b/http2/write.go
@@ -13,7 +13,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/bradfitz/http2/hpack"
+	"golang.org/x/net/http2/hpack"
 )
 
 // writeFramer is implemented by any type that is used to write frames.