diff --git a/MAINTAINERS b/MAINTAINERS
index 761086e3e8..d1a49d7194 100755
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -361,6 +361,8 @@ or feedback about project operations.
         People = ["dmcgowan"]
     [Org.swarm]
         People = ["abronan", "allencloud", "aluzzardi", "chanwit", "dongluochen", "jimmyxian", "mhbauer", "nishanttotla", "vieux"]
+    [Org.swarm-frontends]
+        People = ["abronan", "amitshukla", "samalba"]
     [Org.toolbox]
         People = ["jeffdm", "lisean106", "mchiang0610"]
     [Org."v1.10-migrator"]
@@ -641,6 +643,10 @@ or feedback about project operations.
         Name = "Antonio Murdaca"
         Email = "runcom@redhat.com"
         GitHub = "runcom"
+    [People.samalba]
+        Name = "Sam Alba"
+        Email = "sam.alba@docker.com"
+        GitHub = "samalba"
     [People.samoht]
         Name = "Thomas Gazagnaire"
         Email = "thomas@gazagnaire.org"
diff --git a/maintainercollector/main.go b/maintainercollector/main.go
index 9aeb12d9ba..c5af1c4863 100644
--- a/maintainercollector/main.go
+++ b/maintainercollector/main.go
@@ -60,6 +60,7 @@ var (
 		"notary",
 		"spdystream",
 		"swarm",
+		"swarm-frontends",
 		"toolbox",
 		"v1.10-migrator",
 		"vpnkit",