diff --git a/options/options.pb.go b/options/options.pb.go
index 6acabbc0420..c6d9e58f03f 100644
--- a/options/options.pb.go
+++ b/options/options.pb.go
@@ -60,9 +60,9 @@ func (m *ApiMethodOptions) GetDescription() string {
 var E_ApiMethodOptions_ApiOptions = &proto.ExtensionDesc{
 	ExtendedType:  (*google_protobuf.MethodOptions)(nil),
 	ExtensionType: (*ApiMethodOptions)(nil),
-	Field:         5000,
+	Field:         1022,
 	Name:          "gengo.grpc.gateway.ApiMethodOptions.api_options",
-	Tag:           "bytes,5000,opt,name=api_options",
+	Tag:           "bytes,1022,opt,name=api_options",
 }
 
 func init() {
diff --git a/options/options.proto b/options/options.proto
index bd7b814de87..33c6b44019f 100644
--- a/options/options.proto
+++ b/options/options.proto
@@ -7,8 +7,10 @@ import "google/protobuf/descriptor.proto";
 message ApiMethodOptions {
 	extend google.protobuf.MethodOptions {
 		// Describes how the gRPC method should be exported as a RESTful API.
-		// TODO(yugui) Use a globally unique id instead of a organization-private id.
-		optional ApiMethodOptions api_options = 5000;
+		//
+		// The id is a globally unique id for this option, assigned by
+		// protobuf-global-extension-registry@google.com.
+		optional ApiMethodOptions api_options = 1022;
 	}
 
 	// Path of the RESTful API method.