diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 7ee873ff3ee..09dd3c8617a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -14,21 +14,6 @@
 			"Comment": "null-12",
 			"Rev": "7dda39b2e7d5e265014674c5af696ba4186679e9"
 		},
-		{
-			"ImportPath": "code.google.com/p/go.net/context",
-			"Comment": "null-144",
-			"Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-		},
-		{
-			"ImportPath": "code.google.com/p/go.net/html",
-			"Comment": "null-144",
-			"Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-		},
-		{
-			"ImportPath": "code.google.com/p/go.net/websocket",
-			"Comment": "null-144",
-			"Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
-		},
 		{
 			"ImportPath": "code.google.com/p/goauth2/compute/serviceaccount",
 			"Comment": "weekly-50",
@@ -150,6 +135,21 @@
 			"ImportPath": "github.com/vaughan0/go-ini",
 			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
 		},
+		{
+			"ImportPath": "golang.org/x/net/context",
+			"Comment": "null-214",
+			"Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+		},
+		{
+			"ImportPath": "golang.org/x/net/html",
+			"Comment": "null-214",
+			"Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+		},
+		{
+			"ImportPath": "golang.org/x/net/websocket",
+			"Comment": "null-214",
+			"Rev": "c043f0dc72e4cdd23ae039470ea9d63e6680a1b2"
+		},
 		{
 			"ImportPath": "gopkg.in/v1/yaml",
 			"Rev": "1b9791953ba4027efaeb728c7355e542a203be5e"
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go b/Godeps/_workspace/src/golang.org/x/net/context/context.go
similarity index 96%
rename from Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
rename to Godeps/_workspace/src/golang.org/x/net/context/context.go
index e3c5345d757..66aff7cb4a0 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
+++ b/Godeps/_workspace/src/golang.org/x/net/context/context.go
@@ -108,7 +108,7 @@ type Context interface {
 	// 	// Package user defines a User type that's stored in Contexts.
 	// 	package user
 	//
-	// 	import "code.google.com/p/go.net/context"
+	// 	import "golang.org/x/net/context"
 	//
 	// 	// User is the type of value stored in the Contexts.
 	// 	type User struct {...}
@@ -124,7 +124,7 @@ type Context interface {
 	//
 	// 	// NewContext returns a new Context that carries value u.
 	// 	func NewContext(ctx context.Context, u *User) context.Context {
-	// 		return context.WithValue(userKey, u)
+	// 		return context.WithValue(ctx, userKey, u)
 	// 	}
 	//
 	// 	// FromContext returns the User value stored in ctx, if any.
@@ -142,27 +142,28 @@ var Canceled = errors.New("context canceled")
 // deadline passes.
 var DeadlineExceeded = errors.New("context deadline exceeded")
 
-// An emptyCtx is never canceled, has no values, and has no deadline.
+// An emptyCtx is never canceled, has no values, and has no deadline.  It is not
+// struct{}, since vars of this type must have distinct addresses.
 type emptyCtx int
 
-func (emptyCtx) Deadline() (deadline time.Time, ok bool) {
+func (*emptyCtx) Deadline() (deadline time.Time, ok bool) {
 	return
 }
 
-func (emptyCtx) Done() <-chan struct{} {
+func (*emptyCtx) Done() <-chan struct{} {
 	return nil
 }
 
-func (emptyCtx) Err() error {
+func (*emptyCtx) Err() error {
 	return nil
 }
 
-func (emptyCtx) Value(key interface{}) interface{} {
+func (*emptyCtx) Value(key interface{}) interface{} {
 	return nil
 }
 
-func (n emptyCtx) String() string {
-	switch n {
+func (e *emptyCtx) String() string {
+	switch e {
 	case background:
 		return "context.Background"
 	case todo:
@@ -171,9 +172,9 @@ func (n emptyCtx) String() string {
 	return "unknown empty Context"
 }
 
-const (
-	background emptyCtx = 1
-	todo       emptyCtx = 2
+var (
+	background = new(emptyCtx)
+	todo       = new(emptyCtx)
 )
 
 // Background returns a non-nil, empty Context. It is never canceled, has no
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go b/Godeps/_workspace/src/golang.org/x/net/context/context_test.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
rename to Godeps/_workspace/src/golang.org/x/net/context/context_test.go
index c1a4de5ff77..82d2494a492 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/context/context_test.go
@@ -365,7 +365,7 @@ func TestAllocs(t *testing.T) {
 				c := WithValue(bg, k1, nil)
 				c.Value(k1)
 			},
-			limit:      1,
+			limit:      3,
 			gccgoLimit: 3,
 		},
 		{
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go b/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
similarity index 94%
rename from Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
rename to Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
index 0d00b3de351..a6754dc3689 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/context/withtimeout_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 )
 
 func ExampleWithTimeout() {
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom.go
rename to Godeps/_workspace/src/golang.org/x/net/html/atom/atom.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/atom/atom_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/atom/atom_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/atom/gen.go
rename to Godeps/_workspace/src/golang.org/x/net/html/atom/gen.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table.go
rename to Godeps/_workspace/src/golang.org/x/net/html/atom/table.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go b/Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/atom/table_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/atom/table_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
similarity index 94%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
index 39dc268143e..b19f83b7276 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset.go
@@ -1,3 +1,7 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // Package charset provides common text encodings for HTML documents.
 //
 // The mapping from encoding labels to encodings is defined at
@@ -11,10 +15,10 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"code.google.com/p/go.net/html"
-	"code.google.com/p/go.text/encoding"
-	"code.google.com/p/go.text/encoding/charmap"
-	"code.google.com/p/go.text/transform"
+	"golang.org/x/net/html"
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/transform"
 )
 
 // Lookup returns the encoding with the specified label, and its canonical
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
similarity index 93%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
index a656dd90c4e..d309f75c621 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/charset_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/charset_test.go
@@ -1,12 +1,17 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package charset
 
 import (
 	"bytes"
 	"io/ioutil"
+	"runtime"
 	"strings"
 	"testing"
 
-	"code.google.com/p/go.text/transform"
+	"golang.org/x/text/transform"
 )
 
 func transformString(t transform.Transformer, s string) (string, error) {
@@ -129,6 +134,11 @@ var sniffTestCases = []struct {
 }
 
 func TestSniff(t *testing.T) {
+	switch runtime.GOOS {
+	case "nacl": // platforms that don't permit direct file system access
+		t.Skipf("not supported on %q", runtime.GOOS)
+	}
+
 	for _, tc := range sniffTestCases {
 		content, err := ioutil.ReadFile("testdata/" + tc.filename)
 		if err != nil {
@@ -145,6 +155,11 @@ func TestSniff(t *testing.T) {
 }
 
 func TestReader(t *testing.T) {
+	switch runtime.GOOS {
+	case "nacl": // platforms that don't permit direct file system access
+		t.Skipf("not supported on %q", runtime.GOOS)
+	}
+
 	for _, tc := range sniffTestCases {
 		content, err := ioutil.ReadFile("testdata/" + tc.filename)
 		if err != nil {
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
similarity index 90%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
index 25a9eb64791..8b769099662 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/gen.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/gen.go
@@ -1,3 +1,7 @@
+// Copyright 2013 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 // +build ignore
 
 package main
@@ -48,9 +52,9 @@ func main() {
 	fmt.Println()
 
 	fmt.Println("import (")
-	fmt.Println(`"code.google.com/p/go.text/encoding"`)
+	fmt.Println(`"golang.org/x/text/encoding"`)
 	for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
-		fmt.Printf("\"code.google.com/p/go.text/encoding/%s\"\n", pkg)
+		fmt.Printf("\"golang.org/x/text/encoding/%s\"\n", pkg)
 	}
 	fmt.Println(")")
 	fmt.Println()
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
similarity index 97%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
index 66f8af16157..aa0d9484071 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/table.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/charset/table.go
@@ -3,13 +3,13 @@
 package charset
 
 import (
-	"code.google.com/p/go.text/encoding"
-	"code.google.com/p/go.text/encoding/charmap"
-	"code.google.com/p/go.text/encoding/japanese"
-	"code.google.com/p/go.text/encoding/korean"
-	"code.google.com/p/go.text/encoding/simplifiedchinese"
-	"code.google.com/p/go.text/encoding/traditionalchinese"
-	"code.google.com/p/go.text/encoding/unicode"
+	"golang.org/x/text/encoding"
+	"golang.org/x/text/encoding/charmap"
+	"golang.org/x/text/encoding/japanese"
+	"golang.org/x/text/encoding/korean"
+	"golang.org/x/text/encoding/simplifiedchinese"
+	"golang.org/x/text/encoding/traditionalchinese"
+	"golang.org/x/text/encoding/unicode"
 )
 
 var encodings = map[string]struct {
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-charset.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-charset.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-charset.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/HTTP-vs-meta-content.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/No-encoding-declaration.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/README
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/README
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16BE-BOM.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-16LE-BOM.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-charset-attribute.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html b/Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/charset/testdata/meta-content-attribute.html
rename to Godeps/_workspace/src/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/const.go b/Godeps/_workspace/src/golang.org/x/net/html/const.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/const.go
rename to Godeps/_workspace/src/golang.org/x/net/html/const.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go b/Godeps/_workspace/src/golang.org/x/net/html/doc.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/doc.go
rename to Godeps/_workspace/src/golang.org/x/net/html/doc.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go b/Godeps/_workspace/src/golang.org/x/net/html/doctype.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/doctype.go
rename to Godeps/_workspace/src/golang.org/x/net/html/doctype.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go b/Godeps/_workspace/src/golang.org/x/net/html/entity.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/entity.go
rename to Godeps/_workspace/src/golang.org/x/net/html/entity.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go b/Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/entity_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/entity_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go b/Godeps/_workspace/src/golang.org/x/net/html/escape.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/escape.go
rename to Godeps/_workspace/src/golang.org/x/net/html/escape.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go b/Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/escape_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/escape_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
similarity index 96%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/example_test.go
index 47341f020a2..0b06ed7730f 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/example_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/example_test.go
@@ -10,7 +10,7 @@ import (
 	"log"
 	"strings"
 
-	"code.google.com/p/go.net/html"
+	"golang.org/x/net/html"
 )
 
 func ExampleParse() {
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go b/Godeps/_workspace/src/golang.org/x/net/html/foreign.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/foreign.go
rename to Godeps/_workspace/src/golang.org/x/net/html/foreign.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/node.go b/Godeps/_workspace/src/golang.org/x/net/html/node.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/node.go
rename to Godeps/_workspace/src/golang.org/x/net/html/node.go
index e7b4e50a019..26b657aec83 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/node.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/node.go
@@ -5,7 +5,7 @@
 package html
 
 import (
-	"code.google.com/p/go.net/html/atom"
+	"golang.org/x/net/html/atom"
 )
 
 // A NodeType is the type of a Node.
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go b/Godeps/_workspace/src/golang.org/x/net/html/node_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/node_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/node_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go
rename to Godeps/_workspace/src/golang.org/x/net/html/parse.go
index 501c64aad95..b42a3238fff 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse.go
@@ -10,7 +10,7 @@ import (
 	"io"
 	"strings"
 
-	a "code.google.com/p/go.net/html/atom"
+	a "golang.org/x/net/html/atom"
 )
 
 // A parser implements the HTML5 parsing algorithm:
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
index 253b04d3900..7e47d11be8a 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/parse_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/parse_test.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"testing"
 
-	"code.google.com/p/go.net/html/atom"
+	"golang.org/x/net/html/atom"
 )
 
 // readParseTest reads a single test case from r.
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/render.go b/Godeps/_workspace/src/golang.org/x/net/html/render.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/render.go
rename to Godeps/_workspace/src/golang.org/x/net/html/render.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go b/Godeps/_workspace/src/golang.org/x/net/html/render_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/render_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/render_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html b/Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/go1.html
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/go1.html
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/README
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/README
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/adoption02.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/adoption02.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/comments01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/comments01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/doctype01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/doctype01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/entities02.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/entities02.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/html5test-com.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/html5test-com.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/inbody01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/inbody01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/isindex.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/isindex.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/pending-spec-changes.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/plain-text-unsafe.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scriptdata01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/adoption01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/scripted/webkit01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tables01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tables01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests1.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests1.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests10.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests10.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests11.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests11.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests12.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests12.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests14.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests14.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests15.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests15.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests16.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests16.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests17.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests17.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests18.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests18.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests19.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests19.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests2.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests2.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests20.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests20.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests21.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests21.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests22.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests22.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests23.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests23.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests24.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests24.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests25.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests25.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests26.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests26.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests3.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests3.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests4.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests4.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests5.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests5.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests6.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests6.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests7.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests7.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests8.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests8.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests9.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests9.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tests_innerHTML_1.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/tricky01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/tricky01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit01.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit01.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat b/Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/testdata/webkit/webkit02.dat
rename to Godeps/_workspace/src/golang.org/x/net/html/testdata/webkit/webkit02.dat
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/token.go b/Godeps/_workspace/src/golang.org/x/net/html/token.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/token.go
rename to Godeps/_workspace/src/golang.org/x/net/html/token.go
index a22609976f4..893e272a9e8 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/html/token.go
+++ b/Godeps/_workspace/src/golang.org/x/net/html/token.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/go.net/html/atom"
+	"golang.org/x/net/html/atom"
 )
 
 // A TokenType is the type of a Token.
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go b/Godeps/_workspace/src/golang.org/x/net/html/token_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/html/token_test.go
rename to Godeps/_workspace/src/golang.org/x/net/html/token_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go b/Godeps/_workspace/src/golang.org/x/net/websocket/client.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/client.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/client.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
similarity index 94%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
index 777a6689532..72bb9d48eba 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/exampledial_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/websocket/exampledial_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"log"
 
-	"code.google.com/p/go.net/websocket"
+	"golang.org/x/net/websocket"
 )
 
 // This example demonstrates a trivial client.
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
similarity index 93%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
index 47b0bb9b58e..f22a98fcd43 100644
--- a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/examplehandler_test.go
+++ b/Godeps/_workspace/src/golang.org/x/net/websocket/examplehandler_test.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"net/http"
 
-	"code.google.com/p/go.net/websocket"
+	"golang.org/x/net/websocket"
 )
 
 // Echo the data received on the WebSocket.
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/hybi.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/hybi_test.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/hybi_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go b/Godeps/_workspace/src/golang.org/x/net/websocket/server.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/server.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/server.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/websocket.go
diff --git a/Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go b/Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/go.net/websocket/websocket_test.go
rename to Godeps/_workspace/src/golang.org/x/net/websocket/websocket_test.go
diff --git a/pkg/api/context.go b/pkg/api/context.go
index a1f2ffc511e..84a946d02c8 100644
--- a/pkg/api/context.go
+++ b/pkg/api/context.go
@@ -19,7 +19,7 @@ package api
 import (
 	stderrs "errors"
 
-	"code.google.com/p/go.net/context"
+	"golang.org/x/net/context"
 )
 
 // Context carries values across API boundaries.
diff --git a/pkg/apiserver/proxy.go b/pkg/apiserver/proxy.go
index af734f7f7f7..89be5a9f500 100644
--- a/pkg/apiserver/proxy.go
+++ b/pkg/apiserver/proxy.go
@@ -32,8 +32,8 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 
-	"code.google.com/p/go.net/html"
 	"github.com/golang/glog"
+	"golang.org/x/net/html"
 )
 
 // tagsToAttrs states which attributes of which tags require URL substitution.
diff --git a/pkg/apiserver/proxy_test.go b/pkg/apiserver/proxy_test.go
index 4213ddbba7c..73e4dba1f0d 100644
--- a/pkg/apiserver/proxy_test.go
+++ b/pkg/apiserver/proxy_test.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"testing"
 
-	"code.google.com/p/go.net/html"
+	"golang.org/x/net/html"
 )
 
 func parseURLOrDie(inURL string) *url.URL {
diff --git a/pkg/apiserver/watch.go b/pkg/apiserver/watch.go
index be700561417..f8921196a8f 100644
--- a/pkg/apiserver/watch.go
+++ b/pkg/apiserver/watch.go
@@ -30,8 +30,8 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 	watchjson "github.com/GoogleCloudPlatform/kubernetes/pkg/watch/json"
 
-	"code.google.com/p/go.net/websocket"
 	"github.com/golang/glog"
+	"golang.org/x/net/websocket"
 )
 
 type WatchHandler struct {
diff --git a/pkg/apiserver/watch_test.go b/pkg/apiserver/watch_test.go
index e5dff97ebb7..6b83efa3201 100644
--- a/pkg/apiserver/watch_test.go
+++ b/pkg/apiserver/watch_test.go
@@ -24,10 +24,10 @@ import (
 	"reflect"
 	"testing"
 
-	"code.google.com/p/go.net/websocket"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+	"golang.org/x/net/websocket"
 )
 
 // watchJSON defines the expected JSON wire equivalent of watch.Event