diff --git a/etcdserver/etcdserverpb/genproto.sh b/etcdserver/etcdserverpb/genproto.sh
deleted file mode 100755
index 1aabc60c2..000000000
--- a/etcdserver/etcdserverpb/genproto.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-set -e
-protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto
-
-prefix=github.com/coreos/etcd/third_party
-sed \
-	-i'.bak' \
-	"s|code.google.com/p/gogoprotobuf/proto|$prefix/code.google.com/p/gogoprotobuf/proto|" *.go
-rm *.bak
diff --git a/raft/raftpb/genproto.sh b/raft/raftpb/genproto.sh
deleted file mode 100755
index 1aabc60c2..000000000
--- a/raft/raftpb/genproto.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-set -e
-protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto
-
-prefix=github.com/coreos/etcd/third_party
-sed \
-	-i'.bak' \
-	"s|code.google.com/p/gogoprotobuf/proto|$prefix/code.google.com/p/gogoprotobuf/proto|" *.go
-rm *.bak
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
new file mode 100755
index 000000000..af8397ca2
--- /dev/null
+++ b/scripts/genproto.sh
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+#
+# Generate all etcd protobuf bindings.
+# Run from repository root.
+#
+
+PREFIX="github.com/coreos/etcd/third_party"
+DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb"
+
+SHA="20c42d4d4d776b60d32c2d35ecac40a60793f661"
+
+if ! protoc --version > /dev/null; then
+	echo "could not find protoc, is it installed + in PATH?"
+	exit 255
+fi
+
+# Ensure we have the right version of protoc-gen-gogo by building it every time.
+# TODO(jonboulle): vendor this instead of `go get`ting it.
+export GOPATH=${PWD}/gopath
+export GOBIN=${PWD}/bin
+go get code.google.com/p/gogoprotobuf/{proto,protoc-gen-gogo,gogoproto}
+pushd ${GOPATH}/src/code.google.com/p/gogoprotobuf
+	git reset --hard ${SHA}
+	make
+popd
+
+export PATH="${GOBIN}:${PATH}"
+
+for dir in ${DIRS}; do
+	pushd ${dir}
+		protoc --gogo_out=. -I=.:${GOPATH}/src/code.google.com/p/gogoprotobuf/protobuf:${GOPATH}/src *.proto
+		sed -i".bak" -e "s|code.google.com/p/gogoprotobuf/proto|${PREFIX}/code.google.com/p/gogoprotobuf/proto|" *.go
+		rm -f *.bak
+	popd
+done
diff --git a/snap/snappb/genproto.sh b/snap/snappb/genproto.sh
deleted file mode 100755
index 1aabc60c2..000000000
--- a/snap/snappb/genproto.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-set -e
-protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto
-
-prefix=github.com/coreos/etcd/third_party
-sed \
-	-i'.bak' \
-	"s|code.google.com/p/gogoprotobuf/proto|$prefix/code.google.com/p/gogoprotobuf/proto|" *.go
-rm *.bak
diff --git a/wal/walpb/genproto.sh b/wal/walpb/genproto.sh
deleted file mode 100755
index 1aabc60c2..000000000
--- a/wal/walpb/genproto.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-set -e
-protoc --gogo_out=. -I=.:$GOPATH/src/code.google.com/p/gogoprotobuf/protobuf:$GOPATH/src *.proto
-
-prefix=github.com/coreos/etcd/third_party
-sed \
-	-i'.bak' \
-	"s|code.google.com/p/gogoprotobuf/proto|$prefix/code.google.com/p/gogoprotobuf/proto|" *.go
-rm *.bak