diff --git a/Gopkg.lock b/Gopkg.lock
index 3bed19a..1a3d5ed 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -89,7 +89,7 @@
   branch = "master"
   name = "github.com/measurement-kit/go-measurement-kit"
   packages = ["."]
-  revision = "0869994e6afcfd1d72f53a4621ce48ed218c3f51"
+  revision = "4b936beabe952b25d4d550304c9a04f2277fb4ff"
 
 [[projects]]
   branch = "master"
@@ -97,12 +97,6 @@
   packages = ["."]
   revision = "9520e82c474b0a04dd04f8a40959027271bab992"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/mitchellh/go-homedir"
-  packages = ["."]
-  revision = "b8bc1bf767474819792c23f32d8286a45736f1c6"
-
 [[projects]]
   name = "github.com/oschwald/geoip2-golang"
   packages = ["."]
@@ -201,6 +195,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "46860a32f649dbb2e01b285c0d5581078ba4b28a21e21175d47ccb2725a9c9fb"
+  inputs-digest = "3a330031044d75d519fd996eae4ab4eabc740557fa32d99abb5cfa9fdd1e6ad6"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index a68ad73..7a941ae 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -42,10 +42,6 @@ required = ["github.com/shuLhan/go-bindata/go-bindata"]
   name = "github.com/pkg/errors"
   version = "0.8.0"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/mitchellh/go-homedir"
-
 [[constraint]]
   name = "gopkg.in/AlecAivazis/survey.v1"
   version = "1.4.1"
diff --git a/Makefile b/Makefile
index ca8506d..4acf750 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,10 @@ build-windows:
 	@echo "Building dist/ooni.exe"
 	CC=x86_64-w64-mingw32-gcc GOOS=windows GOARCH=amd64 CGO_ENABLED=1 go build -o dist/ooni.exe -x cmd/ooni/main.go
 
-update-mk:
-	@echo "updating mk"
-	@dep ensure -update github.com/measurement-kit/go-measurement-kit
-	@test -f vendor/github.com/measurement-kit/go-measurement-kit/libs/ || cd vendor && git submodule add https://github.com/measurement-kit/golang-prebuilt.git github.com/measurement-kit/go-measurement-kit/libs # This is a hack to workaround: https://github.com/golang/dep/issues/1240
-.PHONY: update-mk
+update-mk-libs:
+	@echo "updating mk-libs"
+	@cd vendor/github.com/measurement-kit/go-measurement-kit && curl -L -o master.zip https://github.com/measurement-kit/golang-prebuilt/archive/master.zip && unzip master.zip && mv golang-prebuilt-master libs && rm master.zip # This is a hack to workaround: https://github.com/golang/dep/issues/1240
+.PHONY: update-mk-libs
 
 bindata:
 	@$(GO) run vendor/github.com/shuLhan/go-bindata/go-bindata/*.go \