diff --git a/Makefile b/Makefile
deleted file mode 100644
index 69e4f627..00000000
--- a/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-msg.pb.go: msg.proto
-	mkdir -p _pb
-	protoc --go_out=_pb $<
-	cat _pb/$@\
-	|sed s/Request/request/g\
-	|sed s/Response/response/g\
-	|sed s/Newrequest/newRequest/g\
-	|sed s/Newresponse/newResponse/g >$@
-	rm -rf _pb
diff --git a/README.md b/README.md
index f4dbff01..eef469cf 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,24 @@
 # Doozer Client
 
-**Note:** [doozerd](https://github.com/ha/doozerd) is the server.
+**Note:** [doozerd](https://github.com/4ad/doozerd) is the server.
 This is the Go client driver for doozer.
 
 ## How to use
 
 To install the Go client:
 
-    $ go get github.com/ha/doozer
+    $ go get github.com/4ad/doozer
 
 To install the CLI client:
 
-    $ go get github.com/ha/doozer/cmd/doozer
+    $ go get github.com/4ad/doozer/cmd/doozer
 
 To use:
 
     package main
 
     import (
-    	"github.com/ha/doozer"
+    	"github.com/4ad/doozer"
     	"os"
     )
 
@@ -41,13 +41,13 @@ by doing the following:
     $ mkdir doozer
     $ cd doozer
     $ export GOPATH=`pwd`
-    $ go get github.com/ha/doozer/...
+    $ go get github.com/4ad/doozer/...
 
     # ...hack...hack..hack...
-    $ vim src/github.com/ha/doozer/cmd/doozer/help.go
+    $ vim src/github.com/4ad/doozer/cmd/doozer/help.go
 
     # rebuild ./bin/doozer
-    $ go install github.com/ha/doozer/...
+    $ go install github.com/4ad/doozer/...
 
 ## License and Authors
 
diff --git a/cmd/doozer/Makefile b/cmd/doozer/Makefile
deleted file mode 100644
index c293e223..00000000
--- a/cmd/doozer/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include ../../Make.inc
-
-VERSION ?= $(shell ../../ver.sh)
-
-TARG=doozer
-GOFILES=\
-	add.go\
-	del.go\
-	doozer.go\
-	get.go\
-	help.go\
-	nop.go\
-	rev.go\
-	set.go\
-	stat.go\
-	vers.go\
-	wait.go\
-	watch.go\
-	find.go\
-	touch.go\
-
-include $(GOROOT)/src/Make.cmd
-
-vers.go:
-	printf 'package main\n\nconst version = `%s`\n' '$(VERSION)' > $@
diff --git a/cmd/doozer/doozer.go b/cmd/doozer/doozer.go
index 6a187c41..69768ee9 100644
--- a/cmd/doozer/doozer.go
+++ b/cmd/doozer/doozer.go
@@ -3,7 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/ha/doozer"
+	"github.com/4ad/doozer"
 	"os"
 	"reflect"
 	"sort"
diff --git a/cmd/doozer/find.go b/cmd/doozer/find.go
index 53241ef1..02d46f15 100644
--- a/cmd/doozer/find.go
+++ b/cmd/doozer/find.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/ha/doozer"
+	"github.com/4ad/doozer"
 	"os"
 )
 
diff --git a/cmd/doozer/vers.go b/cmd/doozer/vers.go
deleted file mode 100644
index 1910b239..00000000
--- a/cmd/doozer/vers.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package main
-
-const version = `0.9.0`
diff --git a/cmd/doozer/version.go b/cmd/doozer/version.go
new file mode 100644
index 00000000..0f7b928c
--- /dev/null
+++ b/cmd/doozer/version.go
@@ -0,0 +1,3 @@
+package main
+
+const version = `unknown-4ad`
diff --git a/msg.ext.go b/msg.ext.go
new file mode 100644
index 00000000..4cf1d089
--- /dev/null
+++ b/msg.ext.go
@@ -0,0 +1,7 @@
+// Extensions to msg.pb.go which are not generated by the protobuf
+// compiler.
+package doozer
+
+func (x response_Err) Error() string {
+	return x.String()
+}
diff --git a/msg.pb.go b/msg.pb.go
index bb89d739..dee6167e 100644
--- a/msg.pb.go
+++ b/msg.pb.go
@@ -127,9 +127,6 @@ func (x response_Err) Enum() *response_Err {
 	*p = x
 	return p
 }
-func (x response_Err) Error() string {
-	return x.String()
-}
 func (x response_Err) String() string {
 	return proto.EnumName(response_Err_name, int32(x))
 }