diff --git a/MAINTAINERS b/MAINTAINERS
index acb8578ca..05fe1155a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,3 @@
-Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)
-Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
 Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
+Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
+Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)
diff --git a/auth/MAINTAINERS b/auth/MAINTAINERS
new file mode 100644
index 000000000..f1e73073f
--- /dev/null
+++ b/auth/MAINTAINERS
@@ -0,0 +1 @@
+Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
diff --git a/buildman/MAINTAINERS b/buildman/MAINTAINERS
new file mode 100644
index 000000000..99447c637
--- /dev/null
+++ b/buildman/MAINTAINERS
@@ -0,0 +1,2 @@
+Charlton Austin <charlton.austin@coreos.com> (@charltonaustin)
+Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)
diff --git a/conf/MAINTAINERS b/conf/MAINTAINERS
new file mode 100644
index 000000000..7de711295
--- /dev/null
+++ b/conf/MAINTAINERS
@@ -0,0 +1,3 @@
+Evan Cordell <evan.cordell@coreos.com> (@ecordell)
+Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
+Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
diff --git a/endpoints/api/MAINTAINERS b/endpoints/api/MAINTAINERS
new file mode 100644
index 000000000..d93e836cf
--- /dev/null
+++ b/endpoints/api/MAINTAINERS
@@ -0,0 +1,3 @@
+Evan Cordell <evan.cordell@coreos.com> (@ecordell)
+Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
+Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)
diff --git a/endpoints/keyserver/MAINTAINERS b/endpoints/keyserver/MAINTAINERS
new file mode 100644
index 000000000..3a3578d8a
--- /dev/null
+++ b/endpoints/keyserver/MAINTAINERS
@@ -0,0 +1,2 @@
+Evan Cordell <evan.cordell@coreos.com> (@ecordell)
+Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
diff --git a/endpoints/v1/MAINTAINERS b/endpoints/v1/MAINTAINERS
new file mode 100644
index 000000000..3ad683af3
--- /dev/null
+++ b/endpoints/v1/MAINTAINERS
@@ -0,0 +1,2 @@
+Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
+Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
diff --git a/endpoints/v2/MAINTAINERS b/endpoints/v2/MAINTAINERS
new file mode 100644
index 000000000..3ad683af3
--- /dev/null
+++ b/endpoints/v2/MAINTAINERS
@@ -0,0 +1,2 @@
+Jake Moshenko <jake.moshenko@coreos.com> (@jakedt)
+Jimmy Zelinskie <jimmy.zelinskie@coreos.com> (@jzelinskie)
diff --git a/endpoints/verbs/MAINTAINERS b/endpoints/verbs/MAINTAINERS
new file mode 100644
index 000000000..e08d8e55b
--- /dev/null
+++ b/endpoints/verbs/MAINTAINERS
@@ -0,0 +1 @@
+Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)
diff --git a/static/MAINTAINERS b/static/MAINTAINERS
new file mode 100644
index 000000000..f43806dba
--- /dev/null
+++ b/static/MAINTAINERS
@@ -0,0 +1,2 @@
+Erica von Buelow <erica.vonbuelow@coreos.com> (@ericavonb)
+Joseph Schorr <joseph.schorr@coreos.com> (@josephschorr)