diff --git a/mflag/example/example.go b/mflag/example/example.go
index 8af8ff9..2e766dd 100644
--- a/mflag/example/example.go
+++ b/mflag/example/example.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	flag "github.com/dotcloud/docker/pkg/mflag"
+	flag "github.com/docker/docker/pkg/mflag"
 )
 
 var (
diff --git a/mflag/flag.go b/mflag/flag.go
index 52f786e..6e3f039 100644
--- a/mflag/flag.go
+++ b/mflag/flag.go
@@ -10,7 +10,7 @@
 	Define flags using flag.String(), Bool(), Int(), etc.
 
 	This declares an integer flag, -f or --flagname, stored in the pointer ip, with type *int.
-		import "flag /github.com/dotcloud/docker/pkg/mflag"
+		import "flag /github.com/docker/docker/pkg/mflag"
 		var ip = flag.Int([]string{"f", "-flagname"}, 1234, "help message for flagname")
 	If you like, you can bind the flag to a variable using the Var() functions.
 		var flagvar int
diff --git a/mflag/flag_test.go b/mflag/flag_test.go
index 4c2222e..2aa6fda 100644
--- a/mflag/flag_test.go
+++ b/mflag/flag_test.go
@@ -7,7 +7,7 @@ package mflag_test
 import (
 	"bytes"
 	"fmt"
-	. "github.com/dotcloud/docker/pkg/mflag"
+	. "github.com/docker/docker/pkg/mflag"
 	"os"
 	"sort"
 	"strings"
diff --git a/term/MAINTAINERS b/term/MAINTAINERS
index 1887dfc..aee10c8 100644
--- a/term/MAINTAINERS
+++ b/term/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@dotcloud.com> (@shykes)
+Solomon Hykes <solomon@docker.com> (@shykes)
diff --git a/truncindex/truncindex_test.go b/truncindex/truncindex_test.go
index f88d667..32c41c7 100644
--- a/truncindex/truncindex_test.go
+++ b/truncindex/truncindex_test.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/dotcloud/docker/utils"
+	"github.com/docker/docker/utils"
 )
 
 // Test the behavior of TruncIndex, an index for querying IDs from a non-conflicting prefix.