diff --git a/Makefile b/Makefile
index b04ed091..5e52cb37 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ $(NETCHECK_EXE): prog/netcheck/netcheck.go
 $(SIGPROXY_EXE): prog/sigproxy/main.go
 $(WEAVEWAIT_EXE): prog/weavewait/*.go net/*.go
 $(DOCKERTLSARGS_EXE): prog/docker_tls_args/*.go
-$(DOCKERPLUGIN_EXE): prog/plugin/*.go plugin/*.go plugin/skel/*.go api/*.go common/docker/*.go
+$(DOCKERPLUGIN_EXE): prog/plugin/*.go plugin/net/*.go plugin/skel/*.go api/*.go common/docker/*.go
 $(TEST_TLS_EXE): test/tls/*.go
 
 $(WEAVEWAIT_EXE) $(SIGPROXY_EXE) $(DOCKERTLSARGS_EXE) $(DOCKERPLUGIN_EXE) $(TEST_TLS_EXE):
diff --git a/plugin/driver.go b/plugin/net/driver.go
similarity index 100%
rename from plugin/driver.go
rename to plugin/net/driver.go
diff --git a/plugin/watcher.go b/plugin/net/watcher.go
similarity index 100%
rename from plugin/watcher.go
rename to plugin/net/watcher.go
diff --git a/prog/plugin/main.go b/prog/plugin/main.go
index 659d5a8a..397d706d 100644
--- a/prog/plugin/main.go
+++ b/prog/plugin/main.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	. "github.com/weaveworks/weave/common"
-	"github.com/weaveworks/weave/plugin"
+	"github.com/weaveworks/weave/plugin/net"
 	"github.com/weaveworks/weave/plugin/skel"
 )