diff --git a/devapp/owners/owners.go b/devapp/owners/owners.go
index 3cb7f7f..b5ae7ce 100644
--- a/devapp/owners/owners.go
+++ b/devapp/owners/owners.go
@@ -13,6 +13,7 @@
 )
 
 type Owner struct {
+	// GitHubUsername is a GitHub user name or team name.
 	GitHubUsername string `json:"githubUsername"`
 	GerritEmail    string `json:"gerritEmail"`
 }
diff --git a/devapp/owners/table.go b/devapp/owners/table.go
index a319f5d..b629dd1 100644
--- a/devapp/owners/table.go
+++ b/devapp/owners/table.go
@@ -74,9 +74,7 @@
 	tombergan    = gh("tombergan")
 	x1ddos       = gh("x1ddos")
 
-	// The tools team does not map to a GitHub username, so we use its Gerrit
-	// group UUID (1080).
-	toolsTeam = Owner{GerritEmail: "1080@62eb7196-b449-3ce5-99f1-c037f21e1705"}
+	toolsTeam = gh("golang/tools-team")
 )
 
 // entries is a map of <repo name>/<path>/<domain> to Owner entries.
diff --git a/internal/gophers/gophers.go b/internal/gophers/gophers.go
index 8a18e96..24ba57c 100644
--- a/internal/gophers/gophers.go
+++ b/internal/gophers/gophers.go
@@ -73,6 +73,8 @@
 //
 // • GitHub username (for example, "@dmitshur"), leading '@' is mandatory
 //
+// • GitHub team name (for example, "@golang/tools-team"), leading '@' is mandatory
+//
 // • Gerrit <account ID>@<instance ID> (for example, "6005@62eb7196-b449-3ce5-99f1-c037f21e1705")
 //
 // • email (for example, "dmitshur@golang.org")
@@ -114,6 +116,7 @@
 	// Not people, but hereby granted personhood:
 	addPerson("Gopherbot", "gobot@golang.org", "@gopherbot", "5976@62eb7196-b449-3ce5-99f1-c037f21e1705", "*bot")
 	addPerson("Gerrit Bot", "letsusegerrit@gmail.com", "12446@62eb7196-b449-3ce5-99f1-c037f21e1705", "*bot")
+	addPerson("Tools Team", "@golang/tools-team", "1080@62eb7196-b449-3ce5-99f1-c037f21e1705")
 
 	addPerson("212472270", "ggp493@gmail.com", "@ggriffiths")
 	addPerson("9.nashi", "9.nashi@gmail.com", "@80nashi")