diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 24265d2ca6..c78a601ac0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,16 @@
 {
 	"ImportPath": "github.com/prometheus/prometheus",
-	"GoVersion": "go1.4.1",
+	"GoVersion": "go1.4",
 	"Deps": [
+		{
+			"ImportPath": "bitbucket.org/ww/goautoneg",
+			"Comment": "null-5",
+			"Rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675"
+		},
+		{
+			"ImportPath": "github.com/beorn7/perks/quantile",
+			"Rev": "b965b613227fddccbfffe13eae360ed3fa822f8d"
+		},
 		{
 			"ImportPath": "github.com/golang/glog",
 			"Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
@@ -18,16 +27,6 @@
 			"ImportPath": "github.com/miekg/dns",
 			"Rev": "b65f52f3f0dd1afa25cbbf63f8e7eb15fb5c0641"
 		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/_vendor/goautoneg",
-			"Comment": "0.2.0",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
-		},
-		{
-			"ImportPath": "github.com/prometheus/client_golang/_vendor/perks/quantile",
-			"Comment": "0.2.0",
-			"Rev": "39e4bc83f974fb141a9e67c042b26322bacc917b"
-		},
 		{
 			"ImportPath": "github.com/prometheus/client_golang/extraction",
 			"Comment": "0.2.0",
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/Makefile b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/Makefile
rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/Makefile
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/README.txt b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/README.txt
rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/README.txt
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg.go b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg.go
rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg_test.go b/Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/autoneg_test.go
rename to Godeps/_workspace/src/bitbucket.org/ww/goautoneg/autoneg_test.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/bench_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/bench_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/bench_test.go
rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/bench_test.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/example_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/example_test.go
rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/example_test.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/exampledata.txt b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/exampledata.txt
rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/exampledata.txt
diff --git a/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test
new file mode 100644
index 0000000000..f5706c454b
Binary files /dev/null and b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/quantile.test differ
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream.go
rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream_test.go b/Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/perks/quantile/stream_test.go
rename to Godeps/_workspace/src/github.com/beorn7/perks/quantile/stream_test.go
diff --git a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST b/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST
deleted file mode 100644
index 71bfe39aa9..0000000000
--- a/Godeps/_workspace/src/github.com/prometheus/client_golang/_vendor/goautoneg/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-Imported at 75cd24fc2f2c from https://bitbucket.org/ww/goautoneg.