diff --git a/client/client.go b/client/client.go
index 4c4ea1c5e..a277a4b18 100644
--- a/client/client.go
+++ b/client/client.go
@@ -1,8 +1,8 @@
 package client
 
 import (
-	"github.com/dotcloud/docker/future"
-	"github.com/dotcloud/docker/rcli"
+	"../future"
+	"../rcli"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/docker/docker.go b/docker/docker.go
index 73939abb6..df8a09443 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/dotcloud/docker/client"
+	"../client"
 	"flag"
 	"log"
 	"os"
diff --git a/dockerd/dockerd.go b/dockerd/dockerd.go
index 456dfe9d6..22ae8df8e 100644
--- a/dockerd/dockerd.go
+++ b/dockerd/dockerd.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/dotcloud/docker"
-	"github.com/dotcloud/docker/server"
+	".."
+	"../server"
 	"flag"
 	"log"
 )
diff --git a/fs/layers_test.go b/fs/layers_test.go
index 9f8353fdd..fa4926f54 100644
--- a/fs/layers_test.go
+++ b/fs/layers_test.go
@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"github.com/dotcloud/docker/fake"
+	"../fake"
 	"io/ioutil"
 	"os"
 	"testing"
diff --git a/fs/store_test.go b/fs/store_test.go
index 33bb16c92..d5715d1ba 100644
--- a/fs/store_test.go
+++ b/fs/store_test.go
@@ -1,7 +1,7 @@
 package fs
 
 import (
-	"github.com/dotcloud/docker/fake"
+	"../fake"
 	"errors"
 	"fmt"
 	"io/ioutil"
diff --git a/server/server.go b/server/server.go
index 00ef9c496..32b2ce584 100644
--- a/server/server.go
+++ b/server/server.go
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/dotcloud/docker"
-	"github.com/dotcloud/docker/fs"
-	"github.com/dotcloud/docker/future"
-	"github.com/dotcloud/docker/rcli"
+	".."
+	"../fs"
+	"../future"
+	"../rcli"
 	"io"
 	"net/http"
 	"net/url"