diff --git a/libcontainer/MAINTAINERS b/libcontainer/MAINTAINERS
index e53d933..1cb5513 100644
--- a/libcontainer/MAINTAINERS
+++ b/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/netlink/MAINTAINERS b/netlink/MAINTAINERS
index e53d933..1cb5513 100644
--- a/netlink/MAINTAINERS
+++ b/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/signal/MAINTAINERS b/signal/MAINTAINERS
new file mode 100644
index 0000000..3300331
--- /dev/null
+++ b/signal/MAINTAINERS
@@ -0,0 +1,2 @@
+Guillaume J. Charmes <guillaume@docker.com> (@creack)
+
diff --git a/term/MAINTAINERS b/term/MAINTAINERS
index 48d4d91..15b8ac3 100644
--- a/term/MAINTAINERS
+++ b/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)