diff --git a/discovery/discovery.go b/discovery/discovery.go
index fe80659d1..8bb1b06dc 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -26,11 +26,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/jonboulle/clockwork"
 	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/pkg/capnslog"
 )
 
 var (
diff --git a/etcdserver/etcdhttp/httptypes/errors.go b/etcdserver/etcdhttp/httptypes/errors.go
index 387a01729..06434bf73 100644
--- a/etcdserver/etcdhttp/httptypes/errors.go
+++ b/etcdserver/etcdhttp/httptypes/errors.go
@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/coreos/pkg/capnslog"
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 )
 
 var (
diff --git a/etcdserver/security/security.go b/etcdserver/security/security.go
index 15d834a20..bc3cf39ea 100644
--- a/etcdserver/security/security.go
+++ b/etcdserver/security/security.go
@@ -23,13 +23,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/crypto/bcrypt"
 	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 	etcderr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/etcdserver"
 	"github.com/coreos/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/etcd/pkg/types"
-	"github.com/coreos/pkg/capnslog"
 )
 
 const (
diff --git a/etcdserver/stats/stats.go b/etcdserver/stats/stats.go
index 5472393a8..5bda72327 100644
--- a/etcdserver/stats/stats.go
+++ b/etcdserver/stats/stats.go
@@ -14,7 +14,7 @@
 
 package stats
 
-import "github.com/coreos/pkg/capnslog"
+import "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 
 var (
 	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/etcdserver", "stats")
diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go
index ff368ef4f..ba64212bd 100644
--- a/pkg/flags/flag.go
+++ b/pkg/flags/flag.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 	"github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/pkg/capnslog"
 )
 
 var (
diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go
index 04b764cdf..423871f30 100644
--- a/pkg/netutil/netutil.go
+++ b/pkg/netutil/netutil.go
@@ -21,7 +21,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/coreos/pkg/capnslog"
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 )
 
 var (
diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go
index 0c9f27f61..6e8f9f035 100644
--- a/pkg/osutil/osutil.go
+++ b/pkg/osutil/osutil.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/pkg/capnslog"
+	"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 )
 
 var (
diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go
index 64bd5cdd5..5e154cace 100644
--- a/pkg/pbutil/pbutil.go
+++ b/pkg/pbutil/pbutil.go
@@ -14,7 +14,7 @@
 
 package pbutil
 
-import "github.com/coreos/pkg/capnslog"
+import "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
 
 var (
 	plog = capnslog.NewPackageLogger("github.com/coreos/etcd/pkg", "flags")