diff --git a/MAINTAINERS b/MAINTAINERS
index 55cb07b72b..96469c9814 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,6 +1,6 @@
-Solomon Hykes <solomon@dotcloud.com>
-Guillaume Charmes <guillaume@dotcloud.com>
-Victor Vieux <victor@dotcloud.com>
-Michael Crosby <michael@crosbymichael.com>
-api.go: Victor Vieux <victor@dotcloud.com>
-Vagrantfile: Daniel Mizyrycki <daniel@dotcloud.com>
+Solomon Hykes <solomon@dotcloud.com> (@shykes)
+Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Victor Vieux <victor@dotcloud.com> (@vieux)
+Michael Crosby <michael@crosbymichael.com> (@crosbymichael)
+api.go: Victor Vieux <victor@dotcloud.com> (@vieux)
+Vagrantfile: Daniel Mizyrycki <daniel@dotcloud.com> (@mzdaniel)
diff --git a/docs/MAINTAINERS b/docs/MAINTAINERS
index f079e58481..a506ce11df 100644
--- a/docs/MAINTAINERS
+++ b/docs/MAINTAINERS
@@ -1,2 +1,2 @@
-Andy Rothfusz <andy@dotcloud.com>
-Ken Cochrane <ken@dotcloud.com>
+Andy Rothfusz <andy@dotcloud.com> (@metalivedev)
+Ken Cochrane <ken@dotcloud.com> (@kencochrane)
diff --git a/docs/sources/api/MAINTAINERS b/docs/sources/api/MAINTAINERS
index e1c6f2ccfc..1887dfc232 100644
--- a/docs/sources/api/MAINTAINERS
+++ b/docs/sources/api/MAINTAINERS
@@ -1 +1 @@
-Solomon Hykes <solomon@dotcloud.com>
+Solomon Hykes <solomon@dotcloud.com> (@shykes)
diff --git a/docs/theme/MAINTAINERS b/docs/theme/MAINTAINERS
index 606a1dd746..93231b1223 100644
--- a/docs/theme/MAINTAINERS
+++ b/docs/theme/MAINTAINERS
@@ -1 +1 @@
-Thatcher Peskens <thatcher@dotcloud.com>
+Thatcher Peskens <thatcher@dotcloud.com> (@dhrp)
diff --git a/hack/dockerbuilder/MAINTAINERS b/hack/dockerbuilder/MAINTAINERS
index 228bd562e5..5dfc881420 100644
--- a/hack/dockerbuilder/MAINTAINERS
+++ b/hack/dockerbuilder/MAINTAINERS
@@ -1 +1 @@
-Daniel Mizyrycki <daniel@dotcloud.com>
+Daniel Mizyrycki <daniel@dotcloud.com> (@mzdaniel)
diff --git a/hack/infrastructure/MAINTAINERS b/hack/infrastructure/MAINTAINERS
index 490b0c1ea2..bd089c55f4 100644
--- a/hack/infrastructure/MAINTAINERS
+++ b/hack/infrastructure/MAINTAINERS
@@ -1,2 +1,2 @@
-Ken Cochrane <ken@dotcloud.com>
-Jerome Petazzoni <jerome@dotcloud.com>
+Ken Cochrane <ken@dotcloud.com> (@kencochrane)
+Jerome Petazzoni <jerome@dotcloud.com> (@jpetazzo)
diff --git a/library/MAINTAINERS b/library/MAINTAINERS
index b1c52939ef..6ac7d8cd79 100644
--- a/library/MAINTAINERS
+++ b/library/MAINTAINERS
@@ -1 +1 @@
-Joffrey Fuhrer <joffrey@dotcloud.com>
+Joffrey Fuhrer <joffrey@dotcloud.com> (@shin-)
diff --git a/packaging/MAINTAINERS b/packaging/MAINTAINERS
index 228bd562e5..5dfc881420 100644
--- a/packaging/MAINTAINERS
+++ b/packaging/MAINTAINERS
@@ -1 +1 @@
-Daniel Mizyrycki <daniel@dotcloud.com>
+Daniel Mizyrycki <daniel@dotcloud.com> (@mzdaniel)
diff --git a/registry/MAINTAINERS b/registry/MAINTAINERS
index b11dfc061b..bf3984f5f9 100644
--- a/registry/MAINTAINERS
+++ b/registry/MAINTAINERS
@@ -1,3 +1,3 @@
-Sam Alba <sam@dotcloud.com>
-Joffrey Fuhrer <joffrey@dotcloud.com>
-Ken Cochrane <ken@dotcloud.com>
+Sam Alba <sam@dotcloud.com> (@samalba)
+Joffrey Fuhrer <joffrey@dotcloud.com> (@shin-)
+Ken Cochrane <ken@dotcloud.com> (@kencochrane)
diff --git a/term/MAINTAINERS b/term/MAINTAINERS
index 8df21a4601..48d4d91b2a 100644
--- a/term/MAINTAINERS
+++ b/term/MAINTAINERS
@@ -1,2 +1,2 @@
-Guillaume Charmes <guillaume@dotcloud.com>
-Solomon Hykes <solomon@dotcloud.com>
+Guillaume Charmes <guillaume@dotcloud.com> (@creack)
+Solomon Hykes <solomon@dotcloud.com> (@shykes)
diff --git a/testing/MAINTAINERS b/testing/MAINTAINERS
index 228bd562e5..5dfc881420 100644
--- a/testing/MAINTAINERS
+++ b/testing/MAINTAINERS
@@ -1 +1 @@
-Daniel Mizyrycki <daniel@dotcloud.com>
+Daniel Mizyrycki <daniel@dotcloud.com> (@mzdaniel)