diff --git a/people/Amanieu.toml b/people/Amanieu.toml
index a45e4f1d5..68904535a 100644
--- a/people/Amanieu.toml
+++ b/people/Amanieu.toml
@@ -3,6 +3,3 @@ github = "Amanieu"
 github-id = 278509
 email = "amanieu@gmail.com"
 zulip-id = 143274
-
-[permissions]
-bors.compiler-builtins.review = true
diff --git a/teams/crate-maintainers.toml b/teams/crate-maintainers.toml
new file mode 100644
index 000000000..361189553
--- /dev/null
+++ b/teams/crate-maintainers.toml
@@ -0,0 +1,27 @@
+name = "crate-maintainers"
+subteam-of = "libs"
+
+[people]
+leads = []
+members = [
+  "Amanieu",
+  "JohnTitor",
+  "KodrAus",
+  "joshtriplett",
+  "the8472",
+  "thomcc",
+  "workingjubilee",
+]
+
+[permissions]
+bors.libc.review = true
+bors.stdarch.review = true
+bors.compiler-builtins.review = true
+
+[[github]]
+orgs = ["rust-lang"]
+
+[website]
+weight = -200
+name = "Crate maintainers"
+description = "Maintaining official rust-lang crates such as log, libc, cc, and more."
diff --git a/teams/libc.toml b/teams/libc.toml
deleted file mode 100644
index 355a1a47f..000000000
--- a/teams/libc.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-name = "libc"
-subteam-of = "libs"
-
-[people]
-leads = []
-members = [
-    "JohnTitor",
-    "joshtriplett",
-    "Amanieu",
-]
-
-[permissions]
-bors.libc.review = true
-
-[[github]]
-orgs = ["rust-lang"]
-
-[website]
-name = "Libc crate team"
-description = "Developing and maintaining the libc crate"
-repo = "https://github.com/rust-lang/libc"