diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 86d83cd30426..e4674be19134 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -64,6 +64,7 @@ for pb in api/etcdserverpb/rpc server/etcdserver/api/v3lock/v3lockpb/v3lock serv
       --grpc-gateway_out=logtostderr=true,paths=source_relative:. \
       --swagger_out=logtostderr=true:./Documentation/dev-guide/apispec/swagger/. \
       --plugin="${SWAGGER_BIN}" --plugin="${GRPC_GATEWAY_BIN}" \
+      --go_opt=Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor \
       ${pb}.proto
   # hack to move gw files around so client won't include them
   pkgpath=$(dirname "${pb}")