diff --git a/examples/addsvc/transport_grpc.go b/examples/addsvc/transport_grpc.go
index 2ed54b7..21e60bc 100644
--- a/examples/addsvc/transport_grpc.go
+++ b/examples/addsvc/transport_grpc.go
@@ -7,6 +7,7 @@
 	"context"
 
 	stdopentracing "github.com/opentracing/opentracing-go"
+	oldcontext "golang.org/x/net/context"
 
 	"github.com/go-kit/kit/examples/addsvc/pb"
 	"github.com/go-kit/kit/log"
@@ -42,7 +43,7 @@
 	concat grpctransport.Handler
 }
 
-func (s *grpcServer) Sum(ctx context.Context, req *pb.SumRequest) (*pb.SumReply, error) {
+func (s *grpcServer) Sum(ctx oldcontext.Context, req *pb.SumRequest) (*pb.SumReply, error) {
 	_, rep, err := s.sum.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
@@ -50,7 +51,7 @@
 	return rep.(*pb.SumReply), nil
 }
 
-func (s *grpcServer) Concat(ctx context.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
+func (s *grpcServer) Concat(ctx oldcontext.Context, req *pb.ConcatRequest) (*pb.ConcatReply, error) {
 	_, rep, err := s.concat.ServeGRPC(ctx, req)
 	if err != nil {
 		return nil, err
diff --git a/transport/grpc/client.go b/transport/grpc/client.go
index ae4672a..7ab43c6 100644
--- a/transport/grpc/client.go
+++ b/transport/grpc/client.go
@@ -1,11 +1,11 @@
 package grpc
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"strings"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 
diff --git a/transport/grpc/encode_decode.go b/transport/grpc/encode_decode.go
index 951768b..f2900ed 100644
--- a/transport/grpc/encode_decode.go
+++ b/transport/grpc/encode_decode.go
@@ -1,25 +1,25 @@
 package grpc
 
 import (
-	"golang.org/x/net/context"
+	"context"
 )
 
 // DecodeRequestFunc extracts a user-domain request object from a gRPC request.
 // It's designed to be used in gRPC servers, for server-side endpoints. One
-// straightforward DecodeRequestFunc could be something that
-// decodes from the gRPC request message to the concrete request type.
+// straightforward DecodeRequestFunc could be something that decodes from the
+// gRPC request message to the concrete request type.
 type DecodeRequestFunc func(context.Context, interface{}) (request interface{}, err error)
 
 // EncodeRequestFunc encodes the passed request object into the gRPC request
-// object. It's designed to be used in gRPC clients, for client-side
-// endpoints. One straightforward EncodeRequestFunc could something that
-// encodes the object directly to the gRPC request message.
+// object. It's designed to be used in gRPC clients, for client-side endpoints.
+// One straightforward EncodeRequestFunc could something that encodes the object
+// directly to the gRPC request message.
 type EncodeRequestFunc func(context.Context, interface{}) (request interface{}, err error)
 
 // EncodeResponseFunc encodes the passed response object to the gRPC response
-// message. It's designed to be used in gRPC servers, for server-side
-// endpoints. One straightforward EncodeResponseFunc could be something that
-// encodes the object directly to the gRPC response message.
+// message. It's designed to be used in gRPC servers, for server-side endpoints.
+// One straightforward EncodeResponseFunc could be something that encodes the
+// object directly to the gRPC response message.
 type EncodeResponseFunc func(context.Context, interface{}) (response interface{}, err error)
 
 // DecodeResponseFunc extracts a user-domain response object from a gRPC
diff --git a/transport/grpc/request_response_funcs.go b/transport/grpc/request_response_funcs.go
index aceb84f..aa88ca6 100644
--- a/transport/grpc/request_response_funcs.go
+++ b/transport/grpc/request_response_funcs.go
@@ -1,10 +1,10 @@
 package grpc
 
 import (
+	"context"
 	"encoding/base64"
 	"strings"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 )
 
diff --git a/transport/grpc/server.go b/transport/grpc/server.go
index 637623b..84e27cf 100644
--- a/transport/grpc/server.go
+++ b/transport/grpc/server.go
@@ -1,18 +1,20 @@
 package grpc
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
+	oldcontext "golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/go-kit/kit/endpoint"
 	"github.com/go-kit/kit/log"
 )
 
-// Handler which should be called from the grpc binding of the service
+// Handler which should be called from the gRPC binding of the service
 // implementation. The incoming request parameter, and returned response
 // parameter, are both gRPC types, not user-domain.
 type Handler interface {
-	ServeGRPC(ctx context.Context, request interface{}) (context.Context, interface{}, error)
+	ServeGRPC(ctx oldcontext.Context, request interface{}) (oldcontext.Context, interface{}, error)
 }
 
 // Server wraps an endpoint and implements grpc.Handler.
@@ -73,7 +75,7 @@
 }
 
 // ServeGRPC implements the Handler interface.
-func (s Server) ServeGRPC(grpcCtx context.Context, req interface{}) (context.Context, interface{}, error) {
+func (s Server) ServeGRPC(grpcCtx oldcontext.Context, req interface{}) (oldcontext.Context, interface{}, error) {
 	ctx := s.ctx
 
 	// Retrieve gRPC metadata.