-&& mkdir -p ${GOPATH}/src/github.com/coreos/etcd \
-&& curl -fsSL -k https://github.com/coreos/etcd/archive/v${ETCD_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/github.com/coreos/etcd \
-&& cd ${GOPATH}/src/github.com/coreos/etcd \
+&& mkdir -p $go_install_dir \
+&& curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&& cd ${go_install_dir}/src/ \
+&& ./make.bash \
+\
+&& mkdir -p ${GOPATH}/src/go.etcd.io/etcd \
+&& curl -fsSL -k https://github.com/coreos/etcd/archive/v${ETCD_VERSION}.tar.gz | tar zx --strip-components=1 -C ${GOPATH}/src/go.etcd.io/etcd \
+&& cd ${GOPATH}/src/go.etcd.io/etcd \