diff --git a/router/connection.go b/router/connection.go
index 61ced2b0..4959bbd9 100644
--- a/router/connection.go
+++ b/router/connection.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"encoding/binary"
diff --git a/router/connection_maker.go b/router/connection_maker.go
index 12c5474a..cf951565 100644
--- a/router/connection_maker.go
+++ b/router/connection_maker.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/consts.go b/router/consts.go
index 06add6f9..2d851dfb 100644
--- a/router/consts.go
+++ b/router/consts.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"time"
diff --git a/router/crypto.go b/router/crypto.go
index 4f47f0bb..100ae454 100644
--- a/router/crypto.go
+++ b/router/crypto.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/ethernet_decoder.go b/router/ethernet_decoder.go
index 92be8728..62177383 100644
--- a/router/ethernet_decoder.go
+++ b/router/ethernet_decoder.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/forwarder.go b/router/forwarder.go
index 74c168b8..60208d6b 100644
--- a/router/forwarder.go
+++ b/router/forwarder.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"code.google.com/p/gopacket"
diff --git a/router/mac_cache.go b/router/mac_cache.go
index c08e04c4..c38a29da 100644
--- a/router/mac_cache.go
+++ b/router/mac_cache.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/pcap.go b/router/pcap.go
index bcca3edd..e8594ecd 100644
--- a/router/pcap.go
+++ b/router/pcap.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"code.google.com/p/gopacket/pcap"
diff --git a/router/peer.go b/router/peer.go
index 80dc3d2a..a42db164 100644
--- a/router/peer.go
+++ b/router/peer.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"fmt"
diff --git a/router/peer_cache.go b/router/peer_cache.go
index a5d9f956..c296d40b 100644
--- a/router/peer_cache.go
+++ b/router/peer_cache.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/peer_name_hash.go b/router/peer_name_hash.go
index 2ff84b97..ea538d3a 100644
--- a/router/peer_name_hash.go
+++ b/router/peer_name_hash.go
@@ -2,7 +2,7 @@
 
 // Let peer names be sha256 hashes...of anything (as long as it's
 // unique).
-package weave
+package router
 
 import (
 	"crypto/sha256"
diff --git a/router/peer_name_mac.go b/router/peer_name_mac.go
index 6d572922..47b93cef 100644
--- a/router/peer_name_mac.go
+++ b/router/peer_name_mac.go
@@ -14,7 +14,7 @@
 // Note that we do not mandate *what* MAC should be used as the peer
 // name. In particular it doesn't actually have to be the MAC of, say,
 // the network interface the peer is sniffing on.
-package weave
+package router
 
 import (
 	"net"
diff --git a/router/router.go b/router/router.go
index ec2d9de1..56229d44 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/topology.go b/router/topology.go
index fe3a9323..833481c1 100644
--- a/router/topology.go
+++ b/router/topology.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/types.go b/router/types.go
index 093fa6d9..41a09cf0 100644
--- a/router/types.go
+++ b/router/types.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"bytes"
diff --git a/router/utils.go b/router/utils.go
index da57cf2a..babd837b 100644
--- a/router/utils.go
+++ b/router/utils.go
@@ -1,4 +1,4 @@
-package weave
+package router
 
 import (
 	"crypto/rand"
diff --git a/weaver/Makefile b/weaver/Makefile
index e5b53486..8dba350c 100644
--- a/weaver/Makefile
+++ b/weaver/Makefile
@@ -5,7 +5,7 @@ SUDO=sudo
 
 all: docker-image
 
-weaver: ../*.go main.go
+weaver: ../router/*.go main.go
 	go get -tags netgo
 	go build -ldflags '-extldflags "-static"' -tags netgo
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
diff --git a/weaver/main.go b/weaver/main.go
index 1f351255..7bb0c416 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -6,7 +6,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/davecheney/profile"
-	"github.com/zettio/weave"
+	weave "github.com/zettio/weave/router"
 	"io"
 	"log"
 	"net"