diff --git a/appengine.go b/appengine.go
index 19d0c3e3..af124929 100644
--- a/appengine.go
+++ b/appengine.go
@@ -11,7 +11,7 @@ package appengine // import "google.golang.org/appengine"
 import (
 	"net/http"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )
diff --git a/datastore/datastore.go b/datastore/datastore.go
index d0a5e0d7..6ee449b1 100644
--- a/datastore/datastore.go
+++ b/datastore/datastore.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/datastore/key.go b/datastore/key.go
index da67d279..77dd9e03 100644
--- a/datastore/key.go
+++ b/datastore/key.go
@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/datastore/key_test.go b/datastore/key_test.go
index 9fd8abc5..0944983e 100644
--- a/datastore/key_test.go
+++ b/datastore/key_test.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/datastore/query.go b/datastore/query.go
index 77f29988..0448002c 100644
--- a/datastore/query.go
+++ b/datastore/query.go
@@ -12,7 +12,7 @@ import (
 	"reflect"
 	"strings"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"
diff --git a/datastore/query_test.go b/datastore/query_test.go
index a25a14b3..b6a858b6 100644
--- a/datastore/query_test.go
+++ b/datastore/query_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal/aetesting"
 	pb "google.golang.org/appengine/internal/datastore"
diff --git a/datastore/save.go b/datastore/save.go
index a7d82782..6aeffb63 100644
--- a/datastore/save.go
+++ b/datastore/save.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/datastore"
diff --git a/datastore/transaction.go b/datastore/transaction.go
index a8ea66d6..284037b6 100644
--- a/datastore/transaction.go
+++ b/datastore/transaction.go
@@ -7,7 +7,7 @@ package datastore
 import (
 	"errors"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/internal/aetesting/fake.go b/internal/aetesting/fake.go
index 98ec7300..68925f29 100644
--- a/internal/aetesting/fake.go
+++ b/internal/aetesting/fake.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/internal/api.go b/internal/api.go
index 34fe8f0b..7c7b851c 100644
--- a/internal/api.go
+++ b/internal/api.go
@@ -20,7 +20,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	logpb "google.golang.org/appengine/internal/log"
diff --git a/internal/api_test.go b/internal/api_test.go
index afe6b147..1339c019 100644
--- a/internal/api_test.go
+++ b/internal/api_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	basepb "google.golang.org/appengine/internal/base"
 	remotepb "google.golang.org/appengine/internal/remote_api"
diff --git a/internal/app_identity/app_identity_service.pb.go b/internal/app_identity/app_identity_service.pb.go
index b2df5abf..a5f3bafc 100644
--- a/internal/app_identity/app_identity_service.pb.go
+++ b/internal/app_identity/app_identity_service.pb.go
@@ -24,7 +24,7 @@ It has these top-level messages:
 */
 package app_identity
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/base/api_base.pb.go b/internal/base/api_base.pb.go
index 3e3d4aa6..9ecc29b6 100644
--- a/internal/base/api_base.pb.go
+++ b/internal/base/api_base.pb.go
@@ -19,7 +19,7 @@ It has these top-level messages:
 */
 package base
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/channel/channel_service.pb.go b/internal/channel/channel_service.pb.go
index 8827905d..1b5a6257 100644
--- a/internal/channel/channel_service.pb.go
+++ b/internal/channel/channel_service.pb.go
@@ -16,7 +16,7 @@ It has these top-level messages:
 */
 package channel
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/datastore/datastore_v3.pb.go b/internal/datastore/datastore_v3.pb.go
index 687f13b0..f4fef0de 100644
--- a/internal/datastore/datastore_v3.pb.go
+++ b/internal/datastore/datastore_v3.pb.go
@@ -50,7 +50,7 @@ It has these top-level messages:
 */
 package datastore
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/image/images_service.pb.go b/internal/image/images_service.pb.go
index b3ba8fe1..b66097e4 100644
--- a/internal/image/images_service.pb.go
+++ b/internal/image/images_service.pb.go
@@ -31,7 +31,7 @@ It has these top-level messages:
 */
 package image
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/internal.go b/internal/internal.go
index 5bdedd9c..6c637209 100644
--- a/internal/internal.go
+++ b/internal/internal.go
@@ -16,7 +16,7 @@ import (
 	"net/url"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	remotepb "google.golang.org/appengine/internal/remote_api"
 )
diff --git a/internal/log/log_service.pb.go b/internal/log/log_service.pb.go
index f79b378a..5aae0a76 100644
--- a/internal/log/log_service.pb.go
+++ b/internal/log/log_service.pb.go
@@ -26,7 +26,7 @@ It has these top-level messages:
 */
 package log
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/mail/mail_service.pb.go b/internal/mail/mail_service.pb.go
index bb644b0f..dd2b3304 100644
--- a/internal/mail/mail_service.pb.go
+++ b/internal/mail/mail_service.pb.go
@@ -16,7 +16,7 @@ It has these top-level messages:
 */
 package mail
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/memcache/memcache_service.pb.go b/internal/memcache/memcache_service.pb.go
index 0102587a..301755e4 100644
--- a/internal/memcache/memcache_service.pb.go
+++ b/internal/memcache/memcache_service.pb.go
@@ -31,7 +31,7 @@ It has these top-level messages:
 */
 package memcache
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -318,7 +318,7 @@ func (m *AppOverride) GetMemcacheShardingStrategy() []byte {
 
 type MemcacheGetRequest struct {
 	Key              [][]byte     `protobuf:"bytes,1,rep,name=key" json:"key,omitempty"`
-	NameSpace        *string      `protobuf:"bytes,2,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string      `protobuf:"bytes,2,opt,name=name_space,def=" json:"name_space,omitempty"`
 	ForCas           *bool        `protobuf:"varint,4,opt,name=for_cas" json:"for_cas,omitempty"`
 	Override         *AppOverride `protobuf:"bytes,5,opt,name=override" json:"override,omitempty"`
 	XXX_unrecognized []byte       `json:"-"`
@@ -422,7 +422,7 @@ func (m *MemcacheGetResponse_Item) GetExpiresInSeconds() int32 {
 
 type MemcacheSetRequest struct {
 	Item             []*MemcacheSetRequest_Item `protobuf:"group,1,rep" json:"item,omitempty"`
-	NameSpace        *string                    `protobuf:"bytes,7,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string                    `protobuf:"bytes,7,opt,name=name_space,def=" json:"name_space,omitempty"`
 	Override         *AppOverride               `protobuf:"bytes,10,opt,name=override" json:"override,omitempty"`
 	XXX_unrecognized []byte                     `json:"-"`
 }
@@ -537,7 +537,7 @@ func (m *MemcacheSetResponse) GetSetStatus() []MemcacheSetResponse_SetStatusCode
 
 type MemcacheDeleteRequest struct {
 	Item             []*MemcacheDeleteRequest_Item `protobuf:"group,1,rep" json:"item,omitempty"`
-	NameSpace        *string                       `protobuf:"bytes,4,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string                       `protobuf:"bytes,4,opt,name=name_space,def=" json:"name_space,omitempty"`
 	Override         *AppOverride                  `protobuf:"bytes,5,opt,name=override" json:"override,omitempty"`
 	XXX_unrecognized []byte                        `json:"-"`
 }
@@ -611,7 +611,7 @@ func (m *MemcacheDeleteResponse) GetDeleteStatus() []MemcacheDeleteResponse_Dele
 
 type MemcacheIncrementRequest struct {
 	Key              []byte                              `protobuf:"bytes,1,req,name=key" json:"key,omitempty"`
-	NameSpace        *string                             `protobuf:"bytes,4,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string                             `protobuf:"bytes,4,opt,name=name_space,def=" json:"name_space,omitempty"`
 	Delta            *uint64                             `protobuf:"varint,2,opt,name=delta,def=1" json:"delta,omitempty"`
 	Direction        *MemcacheIncrementRequest_Direction `protobuf:"varint,3,opt,name=direction,enum=appengine.MemcacheIncrementRequest_Direction,def=1" json:"direction,omitempty"`
 	InitialValue     *uint64                             `protobuf:"varint,5,opt,name=initial_value" json:"initial_value,omitempty"`
@@ -701,7 +701,7 @@ func (m *MemcacheIncrementResponse) GetIncrementStatus() MemcacheIncrementRespon
 }
 
 type MemcacheBatchIncrementRequest struct {
-	NameSpace        *string                     `protobuf:"bytes,1,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string                     `protobuf:"bytes,1,opt,name=name_space,def=" json:"name_space,omitempty"`
 	Item             []*MemcacheIncrementRequest `protobuf:"bytes,2,rep,name=item" json:"item,omitempty"`
 	Override         *AppOverride                `protobuf:"bytes,3,opt,name=override" json:"override,omitempty"`
 	XXX_unrecognized []byte                      `json:"-"`
@@ -862,7 +862,7 @@ func (m *MemcacheStatsResponse) GetStats() *MergedNamespaceStats {
 
 type MemcacheGrabTailRequest struct {
 	ItemCount        *int32       `protobuf:"varint,1,req,name=item_count" json:"item_count,omitempty"`
-	NameSpace        *string      `protobuf:"bytes,2,opt,name=name_space" json:"name_space,omitempty"`
+	NameSpace        *string      `protobuf:"bytes,2,opt,name=name_space,def=" json:"name_space,omitempty"`
 	Override         *AppOverride `protobuf:"bytes,3,opt,name=override" json:"override,omitempty"`
 	XXX_unrecognized []byte       `json:"-"`
 }
diff --git a/internal/modules/modules_service.pb.go b/internal/modules/modules_service.pb.go
index 7bf8f212..043b3faf 100644
--- a/internal/modules/modules_service.pb.go
+++ b/internal/modules/modules_service.pb.go
@@ -29,7 +29,7 @@ It has these top-level messages:
 */
 package modules
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/regen.sh b/internal/regen.sh
index 268f41e6..1dc33054 100755
--- a/internal/regen.sh
+++ b/internal/regen.sh
@@ -2,7 +2,7 @@
 #
 # This script rebuilds the generated code for the protocol buffers.
 # To run this you will need protoc and goprotobuf installed;
-# see https://code.google.com/p/goprotobuf/ for instructions.
+# see https://github.com/golang/protobuf for instructions.
 
 PKG=google.golang.org/appengine
 
diff --git a/internal/remote_api/remote_api.pb.go b/internal/remote_api/remote_api.pb.go
index b43aed95..2bc44b97 100644
--- a/internal/remote_api/remote_api.pb.go
+++ b/internal/remote_api/remote_api.pb.go
@@ -16,7 +16,7 @@ It has these top-level messages:
 */
 package remote_api
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/search/search.pb.go b/internal/search/search.pb.go
index 59373a8d..3da87ce3 100644
--- a/internal/search/search.pb.go
+++ b/internal/search/search.pb.go
@@ -54,7 +54,7 @@ It has these top-level messages:
 */
 package search
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/taskqueue/taskqueue_service.pb.go b/internal/taskqueue/taskqueue_service.pb.go
index 9c827210..1da0ae3a 100644
--- a/internal/taskqueue/taskqueue_service.pb.go
+++ b/internal/taskqueue/taskqueue_service.pb.go
@@ -51,7 +51,7 @@ It has these top-level messages:
 */
 package taskqueue
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 import appengine "google.golang.org/appengine/internal/datastore"
 
@@ -315,6 +315,12 @@ func (m *TaskPayload) Marshal() ([]byte, error) {
 func (m *TaskPayload) Unmarshal(buf []byte) error {
 	return proto.UnmarshalMessageSet(buf, m.ExtensionMap())
 }
+func (m *TaskPayload) MarshalJSON() ([]byte, error) {
+	return proto.MarshalMessageSetJSON(m.XXX_extensions)
+}
+func (m *TaskPayload) UnmarshalJSON(buf []byte) error {
+	return proto.UnmarshalMessageSetJSON(buf, m.XXX_extensions)
+}
 
 // ensure TaskPayload satisfies proto.Marshaler and proto.Unmarshaler
 var _ proto.Marshaler = (*TaskPayload)(nil)
diff --git a/internal/transaction.go b/internal/transaction.go
index 6d8f6a35..543f1c52 100644
--- a/internal/transaction.go
+++ b/internal/transaction.go
@@ -5,7 +5,7 @@ package internal
 import (
 	"reflect"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	pb "google.golang.org/appengine/internal/datastore"
 )
diff --git a/internal/urlfetch/urlfetch_service.pb.go b/internal/urlfetch/urlfetch_service.pb.go
index b218e3bb..ef7fd26e 100644
--- a/internal/urlfetch/urlfetch_service.pb.go
+++ b/internal/urlfetch/urlfetch_service.pb.go
@@ -15,7 +15,7 @@ It has these top-level messages:
 */
 package urlfetch
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/internal/user/user_service.pb.go b/internal/user/user_service.pb.go
index 0cb475f4..5d425acc 100644
--- a/internal/user/user_service.pb.go
+++ b/internal/user/user_service.pb.go
@@ -21,7 +21,7 @@ It has these top-level messages:
 */
 package user
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -84,7 +84,7 @@ func (*UserServiceError) ProtoMessage()    {}
 type CreateLoginURLRequest struct {
 	DestinationUrl    *string `protobuf:"bytes,1,req,name=destination_url" json:"destination_url,omitempty"`
 	AuthDomain        *string `protobuf:"bytes,2,opt,name=auth_domain" json:"auth_domain,omitempty"`
-	FederatedIdentity *string `protobuf:"bytes,3,opt,name=federated_identity" json:"federated_identity,omitempty"`
+	FederatedIdentity *string `protobuf:"bytes,3,opt,name=federated_identity,def=" json:"federated_identity,omitempty"`
 	XXX_unrecognized  []byte  `json:"-"`
 }
 
@@ -197,9 +197,9 @@ type GetOAuthUserResponse struct {
 	Email            *string  `protobuf:"bytes,1,req,name=email" json:"email,omitempty"`
 	UserId           *string  `protobuf:"bytes,2,req,name=user_id" json:"user_id,omitempty"`
 	AuthDomain       *string  `protobuf:"bytes,3,req,name=auth_domain" json:"auth_domain,omitempty"`
-	UserOrganization *string  `protobuf:"bytes,4,opt,name=user_organization" json:"user_organization,omitempty"`
+	UserOrganization *string  `protobuf:"bytes,4,opt,name=user_organization,def=" json:"user_organization,omitempty"`
 	IsAdmin          *bool    `protobuf:"varint,5,opt,name=is_admin,def=0" json:"is_admin,omitempty"`
-	ClientId         *string  `protobuf:"bytes,6,opt,name=client_id" json:"client_id,omitempty"`
+	ClientId         *string  `protobuf:"bytes,6,opt,name=client_id,def=" json:"client_id,omitempty"`
 	Scopes           []string `protobuf:"bytes,7,rep,name=scopes" json:"scopes,omitempty"`
 	XXX_unrecognized []byte   `json:"-"`
 }
diff --git a/internal/xmpp/xmpp_service.pb.go b/internal/xmpp/xmpp_service.pb.go
index e77f6bfa..db7f47aa 100644
--- a/internal/xmpp/xmpp_service.pb.go
+++ b/internal/xmpp/xmpp_service.pb.go
@@ -23,7 +23,7 @@ It has these top-level messages:
 */
 package xmpp
 
-import proto "code.google.com/p/goprotobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/log/log.go b/log/log.go
index e49d8a96..b169cde6 100644
--- a/log/log.go
+++ b/log/log.go
@@ -34,7 +34,7 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/log/log_test.go b/log/log_test.go
index b8803697..5d7e985a 100644
--- a/log/log_test.go
+++ b/log/log_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	pb "google.golang.org/appengine/internal/log"
 )
diff --git a/mail/mail.go b/mail/mail.go
index 22b72ad3..5a26d595 100644
--- a/mail/mail.go
+++ b/mail/mail.go
@@ -22,7 +22,7 @@ package mail // import "google.golang.org/appengine/mail"
 import (
 	"net/mail"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/mail/mail_test.go b/mail/mail_test.go
index 0e6b3069..7502c597 100644
--- a/mail/mail_test.go
+++ b/mail/mail_test.go
@@ -7,7 +7,7 @@ package mail
 import (
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal/aetesting"
 	basepb "google.golang.org/appengine/internal/base"
diff --git a/memcache/memcache.go b/memcache/memcache.go
index 26fe0754..240ef873 100644
--- a/memcache/memcache.go
+++ b/memcache/memcache.go
@@ -35,7 +35,7 @@ import (
 	"errors"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/module/module.go b/module/module.go
index 57096178..d130b7de 100644
--- a/module/module.go
+++ b/module/module.go
@@ -11,7 +11,7 @@ including the module name.
 package module // import "google.golang.org/appengine/module"
 
 import (
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	pb "google.golang.org/appengine/internal/modules"
diff --git a/module/module_test.go b/module/module_test.go
index 0610278d..73e8971d 100644
--- a/module/module_test.go
+++ b/module/module_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal/aetesting"
 	pb "google.golang.org/appengine/internal/modules"
diff --git a/namespace.go b/namespace.go
index acb15d45..73b01e09 100644
--- a/namespace.go
+++ b/namespace.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	basepb "google.golang.org/appengine/internal/base"
diff --git a/remote_api/client.go b/remote_api/client.go
index 5b218280..3b80041e 100644
--- a/remote_api/client.go
+++ b/remote_api/client.go
@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/remote_api/remote_api.go b/remote_api/remote_api.go
index 8f314861..68c13e8f 100644
--- a/remote_api/remote_api.go
+++ b/remote_api/remote_api.go
@@ -15,7 +15,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/search/search.go b/search/search.go
index b36c525b..2eefd41a 100644
--- a/search/search.go
+++ b/search/search.go
@@ -103,7 +103,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/search/search_test.go b/search/search_test.go
index 49fa419b..6178c517 100644
--- a/search/search_test.go
+++ b/search/search_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal/aetesting"
diff --git a/taskqueue/taskqueue.go b/taskqueue/taskqueue.go
index 8708671f..8068b0d4 100644
--- a/taskqueue/taskqueue.go
+++ b/taskqueue/taskqueue.go
@@ -23,7 +23,7 @@ import (
 	"net/url"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/timeout.go b/timeout.go
index 53034be6..47fda68e 100644
--- a/timeout.go
+++ b/timeout.go
@@ -7,7 +7,7 @@ package appengine
 import (
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )
diff --git a/timeout_test.go b/timeout_test.go
index 988fdca8..52df3fc6 100644
--- a/timeout_test.go
+++ b/timeout_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 )
diff --git a/urlfetch/urlfetch.go b/urlfetch/urlfetch.go
index f3cdae62..a1cb1227 100644
--- a/urlfetch/urlfetch.go
+++ b/urlfetch/urlfetch.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/user/user.go b/user/user.go
index 0caab003..16b0e7ec 100644
--- a/user/user.go
+++ b/user/user.go
@@ -8,7 +8,7 @@ package user // import "google.golang.org/appengine/user"
 import (
 	"strings"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal"
diff --git a/user/user_test.go b/user/user_test.go
index 89022228..77b9404d 100644
--- a/user/user_test.go
+++ b/user/user_test.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine/internal"
 	"google.golang.org/appengine/internal/aetesting"
diff --git a/xmpp/xmpp_test.go b/xmpp/xmpp_test.go
index da70c44c..c3030d36 100644
--- a/xmpp/xmpp_test.go
+++ b/xmpp/xmpp_test.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
 
 	"google.golang.org/appengine"
 	"google.golang.org/appengine/internal/aetesting"