diff --git a/MAINTAINERS b/MAINTAINERS
index 49d14ba0bd..d1f4d15491 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,5 @@
 Solomon Hykes <solomon@dotcloud.com> (@shykes)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
 Victor Vieux <vieux@docker.com> (@vieux)
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
 .travis.yml: Tianon Gravi <admwiggin@gmail.com> (@tianon)
diff --git a/contrib/host-integration/Dockerfile.dev b/contrib/host-integration/Dockerfile.dev
index 161416e750..800216532f 100644
--- a/contrib/host-integration/Dockerfile.dev
+++ b/contrib/host-integration/Dockerfile.dev
@@ -6,7 +6,7 @@
 #
 
 FROM		ubuntu:12.10
-MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
+MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 
 RUN		apt-get update && apt-get install -y wget git mercurial
 
diff --git a/contrib/host-integration/Dockerfile.min b/contrib/host-integration/Dockerfile.min
index 1a7b3a9d82..60bb89b986 100644
--- a/contrib/host-integration/Dockerfile.min
+++ b/contrib/host-integration/Dockerfile.min
@@ -1,4 +1,4 @@
 FROM		busybox
-MAINTAINER	Guillaume J. Charmes <guillaume@dotcloud.com>
+MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
 ADD		manager	  /usr/bin/
 ENTRYPOINT	["/usr/bin/manager"]
diff --git a/docs/sources/reference/builder.rst b/docs/sources/reference/builder.rst
index 9f7a816801..3c48939c82 100644
--- a/docs/sources/reference/builder.rst
+++ b/docs/sources/reference/builder.rst
@@ -481,7 +481,7 @@ For example you might add something like this:
     # VERSION               0.0.1
 
     FROM      ubuntu
-    MAINTAINER Guillaume J. Charmes <guillaume@dotcloud.com>
+    MAINTAINER Guillaume J. Charmes <guillaume@docker.com>
 
     # make sure the package repository is up to date
     RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" > /etc/apt/sources.list
diff --git a/execdriver/MAINTAINERS b/execdriver/MAINTAINERS
index e53d933d47..1cb551364d 100644
--- a/execdriver/MAINTAINERS
+++ b/execdriver/MAINTAINERS
@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
diff --git a/pkg/libcontainer/MAINTAINERS b/pkg/libcontainer/MAINTAINERS
index e53d933d47..1cb551364d 100644
--- a/pkg/libcontainer/MAINTAINERS
+++ b/pkg/libcontainer/MAINTAINERS
@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
diff --git a/pkg/netlink/MAINTAINERS b/pkg/netlink/MAINTAINERS
index e53d933d47..1cb551364d 100644
--- a/pkg/netlink/MAINTAINERS
+++ b/pkg/netlink/MAINTAINERS
@@ -1,2 +1,2 @@
 Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
diff --git a/pkg/signal/MAINTAINERS b/pkg/signal/MAINTAINERS
new file mode 100644
index 0000000000..3300331598
--- /dev/null
+++ b/pkg/signal/MAINTAINERS
@@ -0,0 +1,2 @@
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
+
diff --git a/pkg/term/MAINTAINERS b/pkg/term/MAINTAINERS
index 48d4d91b2a..15b8ac3729 100644
--- a/pkg/term/MAINTAINERS
+++ b/pkg/term/MAINTAINERS
@@ -1,2 +1,2 @@
-Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
 Solomon Hykes <solomon@dotcloud.com> (@shykes)