diff --git a/.gitmodules b/.gitmodules
index b3ee97cb..d653c81a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -79,9 +79,6 @@
 [submodule "vendor/golang.org/x/sys"]
 	path = vendor/golang.org/x/sys
 	url = https://go.googlesource.com/sys
-[submodule "vendor/github.com/weaveworks/docker"]
-	path = vendor/github.com/weaveworks/docker
-	url = https://github.com/weaveworks/docker
 [submodule "vendor/github.com/beorn7/perks"]
 	path = vendor/github.com/beorn7/perks
 	url = https://github.com/beorn7/perks
diff --git a/common/mflagext/listvar.go b/common/mflagext/listvar.go
index 6a3bf365..c385e2cd 100644
--- a/common/mflagext/listvar.go
+++ b/common/mflagext/listvar.go
@@ -3,7 +3,7 @@ package mflagext
 import (
 	"fmt"
 
-	"github.com/weaveworks/docker/pkg/mflag"
+	"github.com/weaveworks/common/mflag"
 )
 
 type listOpts struct {
diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go
index acce3bad..3f6b0644 100644
--- a/prog/weaveproxy/main.go
+++ b/prog/weaveproxy/main.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/weaveworks/common/mflag"
 	"github.com/weaveworks/common/signals"
-	"github.com/weaveworks/docker/pkg/mflag"
 	"github.com/weaveworks/weave/common"
 	"github.com/weaveworks/weave/common/mflagext"
 	"github.com/weaveworks/weave/proxy"
diff --git a/prog/weaver/main.go b/prog/weaver/main.go
index 604a09fd..c4011d72 100644
--- a/prog/weaver/main.go
+++ b/prog/weaver/main.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/pkg/profile"
+	"github.com/weaveworks/common/mflag"
 	"github.com/weaveworks/common/signals"
-	"github.com/weaveworks/docker/pkg/mflag"
 	"github.com/weaveworks/mesh"
 
 	"github.com/weaveworks/weave/common"
diff --git a/vendor/github.com/weaveworks/docker b/vendor/github.com/weaveworks/docker
deleted file mode 160000
index 4dc5990d..00000000
--- a/vendor/github.com/weaveworks/docker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4dc5990d7565a4a15d641bc6a0bc50a02cfcf302