diff --git a/auth/MAINTAINERS b/auth/MAINTAINERS
deleted file mode 120000
index dcaec6ec44..0000000000
--- a/auth/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-../registry/MAINTAINERS
\ No newline at end of file
diff --git a/auth/MAINTAINERS b/auth/MAINTAINERS
new file mode 100644
index 0000000000..bf3984f5f9
--- /dev/null
+++ b/auth/MAINTAINERS
@@ -0,0 +1,3 @@
+Sam Alba <sam@dotcloud.com> (@samalba)
+Joffrey Fuhrer <joffrey@dotcloud.com> (@shin-)
+Ken Cochrane <ken@dotcloud.com> (@kencochrane)
diff --git a/hack/MAINTAINERS b/hack/MAINTAINERS
new file mode 100644
index 0000000000..1887dfc232
--- /dev/null
+++ b/hack/MAINTAINERS
@@ -0,0 +1 @@
+Solomon Hykes <solomon@dotcloud.com> (@shykes)