diff --git a/.gitignore b/.gitignore
index e0ff5a859..604fd4d27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /coverage
 /gopath
+/gopath.proto
 /go-bindata
 /machine*
 /bin
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index 424694157..a0706a804 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -24,7 +24,7 @@ GOGO_PROTO_SHA="5f813990bfffa3c2f4414dbea480e705ab280358"
 GRPC_GATEWAY_SHA="c8ec92d0481dd77d9b8c1808eb6476d190aa039a"
 
 # set up self-contained GOPATH for building
-export GOPATH=${PWD}/gopath
+export GOPATH=${PWD}/gopath.proto
 export GOBIN=${PWD}/bin
 export PATH="${GOBIN}:${PATH}"
 
@@ -76,6 +76,8 @@ protoc -I. \
     --swagger_out=logtostderr=true:./Documentation/dev-guide/apispec/swagger/. \
     ./etcdserver/etcdserverpb/rpc.proto
 
+rm -rf ${PWD}/gopath.proto
+
 # TODO: change this whenever we add more swagger API
 mv \
 	Documentation/dev-guide/apispec/swagger/etcdserver/etcdserverpb/rpc.swagger.json \