diff --git a/Makefile b/Makefile
index 323d534e..801afd0c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ PUBLISH=publish_weave publish_weavedns publish_weaveexec
 # If you can use docker without being root, you can do "make SUDO="
 SUDO=sudo
 
-DOCKERHUB_USER=zettio
+DOCKERHUB_USER=weaveworks
 WEAVE_VERSION=git-$(shell git rev-parse --short=12 HEAD)
 WEAVER_EXE=weaver/weaver
 WEAVEDNS_EXE=weavedns/weavedns
diff --git a/bin/release b/bin/release
index f00dbe51..664f5041 100755
--- a/bin/release
+++ b/bin/release
@@ -4,7 +4,7 @@ set -e
 
 SUDO=${SUDO-sudo}
 GITHUB_USER=${GITHUB_USER:-weaveworks}
-DOCKERHUB_USER=${DOCKERHUB_USER:-zettio}
+DOCKERHUB_USER=${DOCKERHUB_USER:-weaveworks}
 RELEASE_NAME=${RELEASE_NAME:-"Weave"}
 RELEASE_DESCRIPTION=${RELEASE_DESCRIPTION:-"Weaving Containers into Applications"}
 
diff --git a/site/building.md b/site/building.md
index 4c636f61..41c3fe83 100644
--- a/site/building.md
+++ b/site/building.md
@@ -54,8 +54,8 @@ $ make
 ```
 
 This will build the weave components and package them into three
-Docker images (`zettio/weave`, `zettio/weavedns`, and
-`zettio/weaveexec`).  These are then exported (as `weave.tar`,
+Docker images (`weaveworks/weave`, `weaveworks/weavedns`, and
+`weaveworks/weaveexec`).  These are then exported (as `weave.tar`,
 `weavedns.tar` and `weaveexec.tar`).
 
 ## Building in a Docker container
diff --git a/weave b/weave
index ba1db8dd..3bd8be15 100755
--- a/weave
+++ b/weave
@@ -11,7 +11,7 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
 
 # These are potentially used for remote execs, and have defaults, so
 # we introduce them here
-DOCKERHUB_USER=zettio
+DOCKERHUB_USER=weaveworks
 BASE_EXEC_IMAGE=$DOCKERHUB_USER/weaveexec
 EXEC_IMAGE=$BASE_EXEC_IMAGE:$IMAGE_VERSION
 PROCFS=${PROCFS:-/proc}