diff --git a/MAINTAINERS b/MAINTAINERS
index f0cc24e0fc..537429cfae 100755
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -319,6 +319,10 @@ or feedback about project operations.
         People = ["aanand", "dnephin", "mnowster", "mpetazzoni", "shin-"]
     [Org.dockercraft]
         People = ["aduermael", "davetucker", "gdevillele"]
+    [Org.go-connections]
+        People = ["calavera"]
+    [Org.go-units]
+        People = ["calavera"]
     [Org.kitematic]
         People = ["elesant", "frenchben", "jeffdm", "mchiang0610"]
     [Org.leeroy]
diff --git a/maintainercollector/main.go b/maintainercollector/main.go
index 5044e50b23..54b3bef8fb 100644
--- a/maintainercollector/main.go
+++ b/maintainercollector/main.go
@@ -39,6 +39,8 @@ var (
 		"docker-bench-security",
 		"docker-py",
 		"dockercraft",
+		"go-connections",
+		"go-units",
 		"kitematic",
 		"leeroy",
 		"libchan",