diff --git a/.travis.yml b/.travis.yml
index 8335a74..9cf1c4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: erlang
 
 script:
- - curl https://raw.github.com/nshah/go.travis/master/install | sh
+ - curl https://raw.github.com/daaku/go.travis/master/install | sh
diff --git a/gracedemo/demo.go b/gracedemo/demo.go
index 7a20b05..b0bc258 100644
--- a/gracedemo/demo.go
+++ b/gracedemo/demo.go
@@ -5,7 +5,7 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/nshah/go.grace/gracehttp"
+	"github.com/daaku/go.grace/gracehttp"
 	"net/http"
 	"time"
 )
diff --git a/gracehttp/http.go b/gracehttp/http.go
index 836c4be..d209c17 100644
--- a/gracehttp/http.go
+++ b/gracehttp/http.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/nshah/go.grace"
+	"github.com/daaku/go.grace"
 	"log"
 	"net"
 	"net/http"
diff --git a/gracehttp/http_test.go b/gracehttp/http_test.go
index 2b8fd2a..9a7631e 100644
--- a/gracehttp/http_test.go
+++ b/gracehttp/http_test.go
@@ -4,8 +4,8 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	"github.com/nshah/go.freeport"
-	"github.com/nshah/go.tool"
+	"github.com/daaku/go.freeport"
+	"github.com/daaku/go.tool"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -200,7 +200,7 @@ func (h *harness) Wait() {
 // The main test case.
 func TestComplex(t *testing.T) {
 	h := &harness{
-		ImportPath: "github.com/nshah/go.grace/gracehttp/testserver",
+		ImportPath: "github.com/daaku/go.grace/gracehttp/testserver",
 		T:          t,
 	}
 	h.Build()
diff --git a/gracehttp/testserver/testserver.go b/gracehttp/testserver/testserver.go
index 6e0296f..df834db 100644
--- a/gracehttp/testserver/testserver.go
+++ b/gracehttp/testserver/testserver.go
@@ -4,7 +4,7 @@ package main
 import (
 	"encoding/json"
 	"flag"
-	"github.com/nshah/go.grace/gracehttp"
+	"github.com/daaku/go.grace/gracehttp"
 	"log"
 	"net/http"
 	"os"
diff --git a/readme.md b/readme.md
index c4291ed..edb7f2b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-go.grace [![Build Status](https://secure.travis-ci.org/nshah/go.grace.png)](http://travis-ci.org/nshah/go.grace)
+go.grace [![Build Status](https://secure.travis-ci.org/daaku/go.grace.png)](http://travis-ci.org/daaku/go.grace)
 ========
 
 Package grace provides a library that makes it easy to build socket
@@ -6,10 +6,10 @@ based servers that can be gracefully terminated & restarted (that is,
 without dropping any connections).
 
 Demo HTTP Server with graceful termination and restart:
-https://github.com/nshah/go.grace/blob/master/gracedemo/demo.go
+https://github.com/daaku/go.grace/blob/master/gracedemo/demo.go
 
 http level graceful termination and restart:
-http://go.pkgdoc.org/github.com/nshah/go.grace/gracehttp
+http://go.pkgdoc.org/github.com/daaku/go.grace/gracehttp
 
 net.Listener level graceful termination and restart:
-http://go.pkgdoc.org/github.com/nshah/go.grace
+http://go.pkgdoc.org/github.com/daaku/go.grace