diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e96378a..c12451f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/prometheus/client_golang",
-	"GoVersion": "go1.4.1",
+	"GoVersion": "go1.4.2",
 	"Packages": [
 		"./..."
 	],
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go
index 7bfafbf..ab3293a 100644
--- a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go
+++ b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile"
+	"github.com/beorn7/perks/quantile"
 )
 
 func Example_simple() {
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go
index 0f85f8e..3fade17 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/all_test.go
@@ -45,7 +45,7 @@ import (
 	"time"
 
 	. "./testdata"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto"
 )
 
 var globalO *Buffer
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go
index 4a519cd..1ac177d 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/clone_test.go
@@ -34,8 +34,9 @@ package proto_test
 import (
 	"testing"
 
+	"github.com/golang/protobuf/proto"
+
 	pb "./testdata"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
 )
 
 var cloneTestMessage = &pb.MyMessage{
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go
index dee5e59..cc25833 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/equal_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto"
 )
 
 // Four identical base messages.
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go
index cf8884c..451ad87 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/extensions_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./testdata"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 func TestGetExtensionsWithMissingExtensions(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go
index bda4789..d4c96a9 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/proto3_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 
 	pb "./proto3_proto"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 func TestProto3ZeroValues(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go
index 6c58541..e5f92d6 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/size_test.go
@@ -37,7 +37,7 @@ import (
 
 	proto3pb "./proto3_proto"
 	pb "./testdata"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto"
 )
 
 var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go
index 3db00c5..f47d9e0 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata/test.pb.go
@@ -37,7 +37,7 @@ It has these top-level messages:
 */
 package testdata
 
-import proto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go
index e27d4dc..1360e8e 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_parser_test.go
@@ -38,7 +38,7 @@ import (
 
 	proto3pb "./proto3_proto"
 	. "./testdata"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto"
 )
 
 type UnmarshalTextTest struct {
diff --git a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go
index 737072a..707bedd 100644
--- a/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go
+++ b/Godeps/_workspace/src/github.com/golang/protobuf/proto/text_test.go
@@ -39,9 +39,10 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/golang/protobuf/proto"
+
 	proto3pb "./proto3_proto"
 	pb "./testdata"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
 )
 
 // textMessage implements the methods that allow it to marshal and unmarshal
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/all_test.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/all_test.go
index 8b2ffb2..7270b67 100644
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/all_test.go
+++ b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/all_test.go
@@ -21,8 +21,8 @@ import (
 	"testing"
 	"testing/quick"
 
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata"
+	. "github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto/testdata"
 )
 
 func TestWriteDelimited(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/decode.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/decode.go
index 7148351..28b520e 100644
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/decode.go
+++ b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/decode.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 var errInvalidVarint = errors.New("invalid varint32 encountered")
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/encode.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/encode.go
index 205ddf9..473b31d 100644
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/encode.go
+++ b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/encode.go
@@ -18,7 +18,7 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 )
 
 // WriteDelimited encodes and dumps a message to the provided writer prefixed
diff --git a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/fixtures_test.go b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/fixtures_test.go
index f5a24db..07e75c5 100644
--- a/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/fixtures_test.go
+++ b/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext/fixtures_test.go
@@ -30,8 +30,8 @@
 package ext
 
 import (
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	. "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto/testdata"
+	. "github.com/golang/protobuf/proto"
+	. "github.com/golang/protobuf/proto/testdata"
 )
 
 // FROM https://github.com/golang/protobuf/blob/master/proto/all_test.go.
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go b/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
index 76c1376..b065f86 100644
--- a/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
+++ b/Godeps/_workspace/src/github.com/prometheus/client_model/go/metrics.pb.go
@@ -22,7 +22,7 @@ It has these top-level messages:
 */
 package io_prometheus_client
 
-import proto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
+import proto "github.com/golang/protobuf/proto"
 import math "math"
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/Makefile b/Makefile
index e99c68d..cd4f9ab 100644
--- a/Makefile
+++ b/Makefile
@@ -73,7 +73,7 @@ build: source_path dependencies
 	$(GO) build ./...
 
 dependencies: source_path $(GOCC)
-	$(GO) get -d -t ./...
+	cp -a $(CURDIR)/Godeps/_workspace/src/* $(GOPATH)/src
 
 example_random: source_path dependencies examples/random/main.go
 	$(GO) build -o example_random examples/random/main.go
diff --git a/extraction/metricfamilyprocessor.go b/extraction/metricfamilyprocessor.go
index f96c232..5edb49c 100644
--- a/extraction/metricfamilyprocessor.go
+++ b/extraction/metricfamilyprocessor.go
@@ -18,8 +18,10 @@ import (
 	"io"
 	"math"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/matttproud/golang_protobuf_extensions/ext"
+
 	"github.com/prometheus/client_golang/model"
 )
 
diff --git a/prometheus/counter_test.go b/prometheus/counter_test.go
index b896188..67391a2 100644
--- a/prometheus/counter_test.go
+++ b/prometheus/counter_test.go
@@ -17,7 +17,7 @@ import (
 	"math"
 	"testing"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestCounterAdd(t *testing.T) {
diff --git a/prometheus/desc.go b/prometheus/desc.go
index 701aea9..7e1f9e8 100644
--- a/prometheus/desc.go
+++ b/prometheus/desc.go
@@ -11,8 +11,9 @@ import (
 
 	"github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/golang/protobuf/proto"
 )
 
 var (
diff --git a/prometheus/example_selfcollector_test.go b/prometheus/example_selfcollector_test.go
index 6bc93d5..608deeb 100644
--- a/prometheus/example_selfcollector_test.go
+++ b/prometheus/example_selfcollector_test.go
@@ -16,8 +16,10 @@ package prometheus_test
 import (
 	"runtime"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+
+	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/prometheus/examples_test.go b/prometheus/examples_test.go
index 590fd7f..5e62967 100644
--- a/prometheus/examples_test.go
+++ b/prometheus/examples_test.go
@@ -21,8 +21,10 @@ import (
 	"runtime"
 	"sort"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/golang/protobuf/proto"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/prometheus/expvar_test.go b/prometheus/expvar_test.go
index d92b57f..5d3128f 100644
--- a/prometheus/expvar_test.go
+++ b/prometheus/expvar_test.go
@@ -19,7 +19,8 @@ import (
 	"sort"
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
diff --git a/prometheus/gauge_test.go b/prometheus/gauge_test.go
index e537171..48cab46 100644
--- a/prometheus/gauge_test.go
+++ b/prometheus/gauge_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func listenGaugeStream(vals, result chan float64, done chan struct{}) {
diff --git a/prometheus/go_collector_test.go b/prometheus/go_collector_test.go
index fe6173d..b0582d1 100644
--- a/prometheus/go_collector_test.go
+++ b/prometheus/go_collector_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestGoCollector(t *testing.T) {
diff --git a/prometheus/histogram.go b/prometheus/histogram.go
index 82c81b4..9b36a61 100644
--- a/prometheus/histogram.go
+++ b/prometheus/histogram.go
@@ -20,9 +20,10 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Histogram counts individual observations from an event or sample stream in
diff --git a/prometheus/histogram_test.go b/prometheus/histogram_test.go
index cc5f93d..855af46 100644
--- a/prometheus/histogram_test.go
+++ b/prometheus/histogram_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func benchmarkHistogramObserve(w int, b *testing.B) {
diff --git a/prometheus/http_test.go b/prometheus/http_test.go
index 6ed8f2f..ffe0418 100644
--- a/prometheus/http_test.go
+++ b/prometheus/http_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type respBody string
diff --git a/prometheus/metric.go b/prometheus/metric.go
index a27bcd4..d8905de 100644
--- a/prometheus/metric.go
+++ b/prometheus/metric.go
@@ -16,7 +16,7 @@ package prometheus
 import (
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Metric models a single sample value with its meta data being exported to
diff --git a/prometheus/process_collector_procfs.go b/prometheus/process_collector_procfs.go
index 952972e..5a09ded 100644
--- a/prometheus/process_collector_procfs.go
+++ b/prometheus/process_collector_procfs.go
@@ -15,7 +15,7 @@
 
 package prometheus
 
-import "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
+import "github.com/prometheus/procfs"
 
 func processCollectSupported() bool {
 	if _, err := procfs.NewStat(); err == nil {
diff --git a/prometheus/process_collector_test.go b/prometheus/process_collector_test.go
index b55f460..829715a 100644
--- a/prometheus/process_collector_test.go
+++ b/prometheus/process_collector_test.go
@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
+	"github.com/prometheus/procfs"
 )
 
 func TestProcessCollector(t *testing.T) {
diff --git a/prometheus/registry.go b/prometheus/registry.go
index a9a5b9d..5507541 100644
--- a/prometheus/registry.go
+++ b/prometheus/registry.go
@@ -33,9 +33,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/bitbucket.org/ww/goautoneg"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"bitbucket.org/ww/goautoneg"
+	"github.com/golang/protobuf/proto"
+
+	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/client_golang/model"
 	"github.com/prometheus/client_golang/text"
 )
diff --git a/prometheus/registry_test.go b/prometheus/registry_test.go
index d37e24f..95579e5 100644
--- a/prometheus/registry_test.go
+++ b/prometheus/registry_test.go
@@ -25,8 +25,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type fakeResponseWriter struct {
diff --git a/prometheus/summary.go b/prometheus/summary.go
index b380b35..a731f4e 100644
--- a/prometheus/summary.go
+++ b/prometheus/summary.go
@@ -20,9 +20,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/beorn7/perks/quantile"
+	"github.com/golang/protobuf/proto"
+
+	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/client_golang/model"
 )
 
diff --git a/prometheus/summary_test.go b/prometheus/summary_test.go
index db48d47..40d05fa 100644
--- a/prometheus/summary_test.go
+++ b/prometheus/summary_test.go
@@ -22,7 +22,7 @@ import (
 	"testing/quick"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func benchmarkSummaryObserve(w int, b *testing.B) {
diff --git a/prometheus/value.go b/prometheus/value.go
index e7f8654..107d43e 100644
--- a/prometheus/value.go
+++ b/prometheus/value.go
@@ -20,8 +20,9 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/golang/protobuf/proto"
 )
 
 // ValueType is an enumeration of metric types that represent a simple value.
diff --git a/text/bench_test.go b/text/bench_test.go
index 6898457..df887e0 100644
--- a/text/bench_test.go
+++ b/text/bench_test.go
@@ -16,11 +16,12 @@ package text
 import (
 	"bytes"
 	"compress/gzip"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
 	"io"
 	"io/ioutil"
 	"testing"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/matttproud/golang_protobuf_extensions/ext"
 )
 
 // Benchmarks to show how much penalty text format parsing actually inflicts.
diff --git a/text/create.go b/text/create.go
index d91c8a6..4430459 100644
--- a/text/create.go
+++ b/text/create.go
@@ -27,8 +27,8 @@ import (
 	"math"
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // MetricFamilyToText converts a MetricFamily proto message into text format and
diff --git a/text/create_test.go b/text/create_test.go
index 2cf6142..fe938de 100644
--- a/text/create_test.go
+++ b/text/create_test.go
@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func testCreate(t testing.TB) {
diff --git a/text/parse.go b/text/parse.go
index ef3a828..e317d68 100644
--- a/text/parse.go
+++ b/text/parse.go
@@ -22,8 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
+
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
 )
 
diff --git a/text/parse_test.go b/text/parse_test.go
index c931fa9..6b7adff 100644
--- a/text/parse_test.go
+++ b/text/parse_test.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var parser Parser
@@ -385,7 +385,7 @@ request_duration_microseconds_count 2693
 					},
 				},
 			},
-		},
+                },
 	}
 
 	for i, scenario := range scenarios {
diff --git a/text/proto.go b/text/proto.go
index 8b016c3..058adfc 100644
--- a/text/proto.go
+++ b/text/proto.go
@@ -17,9 +17,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	"github.com/matttproud/golang_protobuf_extensions/ext"
+
+	dto "github.com/prometheus/client_model/go"
 )
 
 // WriteProtoDelimited writes the MetricFamily to the writer in delimited