diff --git a/godoc/dl/server.go b/godoc/dl/server.go
index bb863545ff..6306c1c9b5 100644
--- a/godoc/dl/server.go
+++ b/godoc/dl/server.go
@@ -7,6 +7,7 @@
 package dl
 
 import (
+	"context"
 	"crypto/hmac"
 	"crypto/md5"
 	"encoding/json"
@@ -20,7 +21,6 @@ import (
 	"time"
 
 	"cloud.google.com/go/datastore"
-	"golang.org/x/net/context"
 	"golang.org/x/tools/godoc/env"
 	"golang.org/x/tools/internal/memcache"
 )
diff --git a/godoc/proxy/proxy.go b/godoc/proxy/proxy.go
index f302372748..1c1798f0fe 100644
--- a/godoc/proxy/proxy.go
+++ b/godoc/proxy/proxy.go
@@ -8,6 +8,7 @@ package proxy
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -18,7 +19,6 @@ import (
 	"strings"
 	"time"
 
-	"golang.org/x/net/context"
 	"golang.org/x/tools/godoc/env"
 )
 
diff --git a/godoc/short/short.go b/godoc/short/short.go
index 5f91cb2204..3a399ab9f0 100644
--- a/godoc/short/short.go
+++ b/godoc/short/short.go
@@ -12,6 +12,7 @@ package short
 // TODO(adg): collect statistics on URL visits
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"html/template"
@@ -22,7 +23,6 @@ import (
 	"regexp"
 
 	"cloud.google.com/go/datastore"
-	"golang.org/x/net/context"
 	"golang.org/x/tools/internal/memcache"
 	"google.golang.org/appengine/user"
 )