diff --git a/third_party/forked/etcd237/pkg/fileutil/BUILD b/third_party/forked/etcd237/pkg/fileutil/BUILD
new file mode 100644
index 00000000000..38be7fe2eb3
--- /dev/null
+++ b/third_party/forked/etcd237/pkg/fileutil/BUILD
@@ -0,0 +1,36 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+    "go_test",
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = [
+        "fileutil_test.go",
+        "lock_test.go",
+        "preallocate_test.go",
+        "purge_test.go",
+    ],
+    library = "go_default_library",
+    tags = ["automanaged"],
+    deps = [],
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "fileutil.go",
+        "lock.go",
+        "lock_unix.go",
+        "preallocate.go",
+        "purge.go",
+        "sync_linux.go",
+    ],
+    tags = ["automanaged"],
+    deps = ["//vendor:github.com/coreos/pkg/capnslog"],
+)
diff --git a/third_party/forked/etcd237/wal/BUILD b/third_party/forked/etcd237/wal/BUILD
new file mode 100644
index 00000000000..bd7f9cd3094
--- /dev/null
+++ b/third_party/forked/etcd237/wal/BUILD
@@ -0,0 +1,32 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "decoder.go",
+        "doc.go",
+        "encoder.go",
+        "metrics.go",
+        "multi_readcloser.go",
+        "repair.go",
+        "util.go",
+        "wal.go",
+    ],
+    tags = ["automanaged"],
+    deps = [
+        "//third_party/forked/etcd237/pkg/fileutil:go_default_library",
+        "//vendor:github.com/coreos/etcd/pkg/crc",
+        "//vendor:github.com/coreos/etcd/pkg/pbutil",
+        "//vendor:github.com/coreos/etcd/raft/raftpb",
+        "//vendor:github.com/coreos/etcd/wal/walpb",
+        "//vendor:github.com/coreos/pkg/capnslog",
+        "//vendor:github.com/prometheus/client_golang/prometheus",
+    ],
+)
diff --git a/third_party/forked/etcd237/wal/walpb/BUILD b/third_party/forked/etcd237/wal/walpb/BUILD
new file mode 100644
index 00000000000..805e0556813
--- /dev/null
+++ b/third_party/forked/etcd237/wal/walpb/BUILD
@@ -0,0 +1,18 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "record.go",
+        "record.pb.go",
+    ],
+    tags = ["automanaged"],
+    deps = ["//vendor:github.com/golang/protobuf/proto"],
+)
diff --git a/third_party/forked/etcd237/wal/walpb/record.pb.go b/third_party/forked/etcd237/wal/walpb/record.pb.go
index dead2876410..52bdf56156f 100644
--- a/third_party/forked/etcd237/wal/walpb/record.pb.go
+++ b/third_party/forked/etcd237/wal/walpb/record.pb.go
@@ -17,7 +17,7 @@ package walpb
 import (
 	"fmt"
 
-	proto "github.com/coreos/etcd237/Godeps/_workspace/src/github.com/gogo/protobuf/proto"
+	proto "github.com/golang/protobuf/proto"
 )
 
 import math "math"