diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
new file mode 100644
index 000000000..4c61d34e8
--- /dev/null
+++ b/Godeps/Godeps.json
@@ -0,0 +1,22 @@
+{
+	"ImportPath": "github.com/coreos/etcd",
+	"GoVersion": "go1.3.1",
+	"Packages": [
+		"./..."
+	],
+	"Deps": [
+		{
+			"ImportPath": "code.google.com/p/go.net/context",
+			"Comment": "null-144",
+			"Rev": "ad01a6fcc8a19d3a4478c836895ffe883bd2ceab"
+		},
+		{
+			"ImportPath": "code.google.com/p/gogoprotobuf/proto",
+			"Rev": "7fd1620f09261338b6b1ca1289ace83aee0ec946"
+		},
+		{
+			"ImportPath": "github.com/stretchr/testify/assert",
+			"Rev": "9cc77fa25329013ce07362c7742952ff887361f2"
+		}
+	]
+}
diff --git a/Godeps/Readme b/Godeps/Readme
new file mode 100644
index 000000000..4cdaa53d5
--- /dev/null
+++ b/Godeps/Readme
@@ -0,0 +1,5 @@
+This directory tree is generated automatically by godep.
+
+Please do not edit.
+
+See https://github.com/tools/godep for more information.
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
new file mode 100644
index 000000000..f037d684e
--- /dev/null
+++ b/Godeps/_workspace/.gitignore
@@ -0,0 +1,2 @@
+/pkg
+/bin
diff --git a/third_party/code.google.com/p/go.net/context/context.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
similarity index 100%
rename from third_party/code.google.com/p/go.net/context/context.go
rename to Godeps/_workspace/src/code.google.com/p/go.net/context/context.go
diff --git a/third_party/code.google.com/p/go.net/context/context_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
similarity index 100%
rename from third_party/code.google.com/p/go.net/context/context_test.go
rename to Godeps/_workspace/src/code.google.com/p/go.net/context/context_test.go
diff --git a/third_party/code.google.com/p/go.net/context/withtimeout_test.go b/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
similarity index 88%
rename from third_party/code.google.com/p/go.net/context/withtimeout_test.go
rename to Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
index e14035641..c5a1da61e 100644
--- a/third_party/code.google.com/p/go.net/context/withtimeout_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/go.net/context/withtimeout_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
 
 func ExampleWithTimeout() {
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/Makefile b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/Makefile
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/Makefile
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/Makefile
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/all_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/all_test.go
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/all_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/all_test.go
index 9a9258899..f41b49919 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/all_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/all_test.go
@@ -44,7 +44,7 @@ import (
 	"time"
 
 	. "./testdata"
-	. "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 var globalO *Buffer
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/clone.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/clone.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/clone_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone_test.go
similarity index 98%
rename from third_party/code.google.com/p/gogoprotobuf/proto/clone_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone_test.go
index d4e0c90f5..434e80fd2 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/clone_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/clone_test.go
@@ -34,7 +34,7 @@ package proto_test
 import (
 	"testing"
 
-	"github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 	pb "./testdata"
 )
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/decode.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/decode.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/decode.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/decode.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/decode_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/decode_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/decode_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/decode_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/encode.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/encode.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/encode.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/encode.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/encode_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/encode_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/encode_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/encode_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/equal.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/equal.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/equal_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal_test.go
similarity index 98%
rename from third_party/code.google.com/p/gogoprotobuf/proto/equal_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal_test.go
index c80b385f9..28abf5e43 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/equal_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/equal_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 // Four identical base messages.
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/extensions.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/extensions.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/extensions.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/extensions.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/extensions_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/extensions_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/extensions_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/extensions_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/lib.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/lib.go
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/lib.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/lib.go
index 29d553010..e70c0fddc 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/lib.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/lib.go
@@ -89,7 +89,7 @@
 
 		package example
 
-		import "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+		import "code.google.com/p/gogoprotobuf/proto"
 
 		type FOO int32
 		const (
@@ -168,7 +168,7 @@
 		import (
 			"log"
 
-			"github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+			"code.google.com/p/gogoprotobuf/proto"
 			"./example.pb"
 		)
 
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/lib_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/lib_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/lib_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/lib_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/message_set.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/message_set.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/message_set.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/message_set.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/pointer_reflect.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_reflect.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/pointer_reflect.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_reflect.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/pointer_unsafe.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_unsafe.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/pointer_unsafe.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_unsafe.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/pointer_unsafe_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_unsafe_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/pointer_unsafe_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/pointer_unsafe_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/properties.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/properties.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/properties.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/properties.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/properties_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/properties_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/properties_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/properties_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/size2_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size2_test.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/size2_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size2_test.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/size_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size_test.go
similarity index 98%
rename from third_party/code.google.com/p/gogoprotobuf/proto/size_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size_test.go
index 9743aefef..a4082ed29 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/size_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/size_test.go
@@ -36,7 +36,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/skip_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/skip_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/skip_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/skip_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/Makefile b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/Makefile
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/testdata/Makefile
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/Makefile
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/golden_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/golden_test.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/testdata/golden_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/golden_test.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go
index 7ddd89ae8..bfb19ad45 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go
@@ -36,7 +36,7 @@ It has these top-level messages:
 */
 package testdata
 
-import proto "github.com/coreos/etcd/third_party/github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden
index 8fd41537b..b79ce68e1 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.pb.go.golden
@@ -4,7 +4,7 @@
 
 package testdata
 
-import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.proto b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.proto
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/testdata/test.proto
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/testdata/test.proto
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/text.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/text.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/text_gogo.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_gogo.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/text_gogo.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_gogo.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/text_parser.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser.go
similarity index 100%
rename from third_party/code.google.com/p/gogoprotobuf/proto/text_parser.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser.go
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/text_parser_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser_test.go
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/text_parser_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser_test.go
index 688417eb8..cc198759f 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/text_parser_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_parser_test.go
@@ -37,7 +37,7 @@ import (
 	"testing"
 
 	. "./testdata"
-	. "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	. "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 )
 
 type UnmarshalTextTest struct {
diff --git a/third_party/code.google.com/p/gogoprotobuf/proto/text_test.go b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_test.go
similarity index 99%
rename from third_party/code.google.com/p/gogoprotobuf/proto/text_test.go
rename to Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_test.go
index 8c851bd79..47c85be43 100644
--- a/third_party/code.google.com/p/gogoprotobuf/proto/text_test.go
+++ b/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto/text_test.go
@@ -39,7 +39,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 	pb "./testdata"
 )
diff --git a/third_party/github.com/stretchr/testify/assert/assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
similarity index 100%
rename from third_party/github.com/stretchr/testify/assert/assertions.go
rename to Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
diff --git a/third_party/github.com/stretchr/testify/assert/assertions_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
similarity index 100%
rename from third_party/github.com/stretchr/testify/assert/assertions_test.go
rename to Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions_test.go
diff --git a/third_party/github.com/stretchr/testify/assert/doc.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
similarity index 100%
rename from third_party/github.com/stretchr/testify/assert/doc.go
rename to Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
diff --git a/third_party/github.com/stretchr/testify/assert/errors.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
similarity index 100%
rename from third_party/github.com/stretchr/testify/assert/errors.go
rename to Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
diff --git a/client/http.go b/client/http.go
index e43a996bc..9a9c225cd 100644
--- a/client/http.go
+++ b/client/http.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
 
 var (
diff --git a/client/http_test.go b/client/http_test.go
index 05aba9cef..b8396a87e 100644
--- a/client/http_test.go
+++ b/client/http_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 )
 
 func TestV2URLHelper(t *testing.T) {
diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
index afc291070..8b0a4da85 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/etcdhttp/http.go
@@ -12,12 +12,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 )
 
 const (
diff --git a/etcdserver/etcdhttp/http_test.go b/etcdserver/etcdhttp/http_test.go
index 48479df0c..339af8bd0 100644
--- a/etcdserver/etcdhttp/http_test.go
+++ b/etcdserver/etcdhttp/http_test.go
@@ -14,12 +14,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 )
 
 func boolp(b bool) *bool { return &b }
diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/etcdserver/etcdserverpb/etcdserver.pb.go
index ca664b2d5..e4f63a7f0 100644
--- a/etcdserver/etcdserverpb/etcdserver.pb.go
+++ b/etcdserver/etcdserverpb/etcdserver.pb.go
@@ -14,14 +14,14 @@
 */
 package etcdserverpb
 
-import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
 // discarding unused import gogoproto "code.google.com/p/gogoprotobuf/gogoproto/gogo.pb"
 
 import io "io"
-import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/etcdserver/server.go b/etcdserver/server.go
index 0f4727776..5070c7ee3 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -9,13 +9,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	"github.com/coreos/etcd/discovery"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/snap"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 	"github.com/coreos/etcd/wait"
 	"github.com/coreos/etcd/wal"
 )
diff --git a/etcdserver/server_test.go b/etcdserver/server_test.go
index a3602c8ba..a9d17188c 100644
--- a/etcdserver/server_test.go
+++ b/etcdserver/server_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/pkg"
 	"github.com/coreos/etcd/raft"
 	"github.com/coreos/etcd/raft/raftpb"
 	"github.com/coreos/etcd/store"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 )
 
 func TestGetExpirationTime(t *testing.T) {
diff --git a/raft/node.go b/raft/node.go
index f9fb55e3c..601db8c65 100644
--- a/raft/node.go
+++ b/raft/node.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"reflect"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	pb "github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 )
 
 var (
diff --git a/raft/node_test.go b/raft/node_test.go
index fa04a1719..9c5d73f45 100644
--- a/raft/node_test.go
+++ b/raft/node_test.go
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/go.net/context"
 	"github.com/coreos/etcd/pkg"
 	"github.com/coreos/etcd/raft/raftpb"
-	"github.com/coreos/etcd/third_party/code.google.com/p/go.net/context"
 )
 
 // TestNodeStep ensures that node.Step sends msgProp to propc chan
diff --git a/raft/raftpb/raft.pb.go b/raft/raftpb/raft.pb.go
index 970476fc8..d82ef6164 100644
--- a/raft/raftpb/raft.pb.go
+++ b/raft/raftpb/raft.pb.go
@@ -17,14 +17,14 @@
 */
 package raftpb
 
-import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
 // discarding unused import gogoproto "code.google.com/p/gogoprotobuf/gogoproto/gogo.pb"
 
 import io "io"
-import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/scripts/genproto.sh b/scripts/genproto.sh
index af8397ca2..7e17bc411 100755
--- a/scripts/genproto.sh
+++ b/scripts/genproto.sh
@@ -4,7 +4,7 @@
 # Run from repository root.
 #
 
-PREFIX="github.com/coreos/etcd/third_party"
+PREFIX="github.com/coreos/etcd/Godeps/_workspace/src"
 DIRS="./wal/walpb ./etcdserver/etcdserverpb ./snap/snappb ./raft/raftpb"
 
 SHA="20c42d4d4d776b60d32c2d35ecac40a60793f661"
diff --git a/snap/snappb/snap.pb.go b/snap/snappb/snap.pb.go
index befc31a79..c8aadec1c 100644
--- a/snap/snappb/snap.pb.go
+++ b/snap/snappb/snap.pb.go
@@ -13,14 +13,14 @@
 */
 package snappb
 
-import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
 // discarding unused import gogoproto "code.google.com/p/gogoprotobuf/gogoproto/gogo.pb"
 
 import io "io"
-import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal
diff --git a/store/stats_test.go b/store/stats_test.go
index d667476f3..3463330bb 100644
--- a/store/stats_test.go
+++ b/store/stats_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/etcd/third_party/github.com/stretchr/testify/assert"
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 )
 
 // Ensure that a successful Get is recorded in the stats.
diff --git a/store/store_test.go b/store/store_test.go
index 280c6c7de..ad3821533 100644
--- a/store/store_test.go
+++ b/store/store_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/stretchr/testify/assert"
 	etcdErr "github.com/coreos/etcd/error"
-	"github.com/coreos/etcd/third_party/github.com/stretchr/testify/assert"
 )
 
 // Ensure that the store can retrieve an existing value.
diff --git a/wal/walpb/record.pb.go b/wal/walpb/record.pb.go
index 6d9267c89..1f93b7521 100644
--- a/wal/walpb/record.pb.go
+++ b/wal/walpb/record.pb.go
@@ -13,14 +13,14 @@
 */
 package walpb
 
-import proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 import json "encoding/json"
 import math "math"
 
 // discarding unused import gogoproto "code.google.com/p/gogoprotobuf/gogoproto/gogo.pb"
 
 import io "io"
-import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/third_party/code.google.com/p/gogoprotobuf/proto"
+import code_google_com_p_gogoprotobuf_proto "github.com/coreos/etcd/Godeps/_workspace/src/code.google.com/p/gogoprotobuf/proto"
 
 // Reference proto, json, and math imports to suppress error if they are not otherwise used.
 var _ = proto.Marshal