diff --git a/repos/rust-lang/api-guidelines.toml b/repos/rust-lang/api-guidelines.toml
index 8a9f889f0..db3d2bb43 100644
--- a/repos/rust-lang/api-guidelines.toml
+++ b/repos/rust-lang/api-guidelines.toml
@@ -10,7 +10,6 @@ branch = "gh-pages"
 path = "/"
 
 [access.teams]
-libs-api = "write"
 libs = "write"
 
 [environments.github-pages]
diff --git a/repos/rust-lang/enzyme.toml b/repos/rust-lang/enzyme.toml
index 0284ef47b..5c4f7c718 100644
--- a/repos/rust-lang/enzyme.toml
+++ b/repos/rust-lang/enzyme.toml
@@ -9,7 +9,6 @@ compiler = "maintain"
 lang = "maintain"
 lang-ops = "maintain"
 libs = "maintain"
-libs-api = "maintain"
 release = "maintain"
 wg-llvm = "maintain"
 
diff --git a/repos/rust-lang/goals.toml b/repos/rust-lang/goals.toml
index b008fa71e..d7e8943b5 100644
--- a/repos/rust-lang/goals.toml
+++ b/repos/rust-lang/goals.toml
@@ -15,7 +15,6 @@ types = "maintain"
 release = "maintain"
 leadership-council = "maintain"
 libs = "maintain"
-libs-api = "maintain"
 edition = "maintain"
 goals = "maintain"
 goal-owners = "maintain"
diff --git a/repos/rust-lang/hashbrown.toml b/repos/rust-lang/hashbrown.toml
index effd0080e..ca9748455 100644
--- a/repos/rust-lang/hashbrown.toml
+++ b/repos/rust-lang/hashbrown.toml
@@ -11,7 +11,6 @@ path = "/"
 
 [access.teams]
 libs = "write"
-libs-contributors = "write"
 
 [[rulesets]]
 pattern = "main"
diff --git a/repos/rust-lang/libs-team.toml b/repos/rust-lang/libs-team.toml
index d3d5cca29..eedf2d412 100644
--- a/repos/rust-lang/libs-team.toml
+++ b/repos/rust-lang/libs-team.toml
@@ -5,5 +5,3 @@ bots = ["rustbot"]
 
 [access.teams]
 libs = "maintain"
-libs-api = "maintain"
-libs-contributors = "maintain"
diff --git a/repos/rust-lang/packed_simd.toml b/repos/rust-lang/packed_simd.toml
index 5ba617223..a41fbc4e1 100644
--- a/repos/rust-lang/packed_simd.toml
+++ b/repos/rust-lang/packed_simd.toml
@@ -10,8 +10,6 @@ branch = "gh-pages"
 path = "/"
 
 [access.teams]
-libs-contributors = "write"
-libs-api = "write"
 libs = "write"
 project-portable-simd = "write"
 
diff --git a/repos/rust-lang/rust-forge.toml b/repos/rust-lang/rust-forge.toml
index fee5bb9cc..64beead9a 100644
--- a/repos/rust-lang/rust-forge.toml
+++ b/repos/rust-lang/rust-forge.toml
@@ -19,7 +19,6 @@ lang = "maintain"
 lang-ops = "maintain"
 leadership-council = "maintain"
 libs = "maintain"
-libs-api = "maintain"
 mods-venue = "maintain"
 edition = "maintain"
 release = "maintain"
diff --git a/repos/rust-lang/rust.toml b/repos/rust-lang/rust.toml
index aaf0d99a5..ca6b5c136 100644
--- a/repos/rust-lang/rust.toml
+++ b/repos/rust-lang/rust.toml
@@ -14,8 +14,6 @@ infra = "write"
 lang = "write"
 lang-ops = "write"
 libs = "write"
-libs-api = "write"
-libs-contributors = "write"
 mods-venue = "write"
 opsem = "write"
 project-exploit-mitigations = "write"
diff --git a/repos/rust-lang/rustc-dev-guide.toml b/repos/rust-lang/rustc-dev-guide.toml
index 6f155bcf7..631e4dad4 100644
--- a/repos/rust-lang/rustc-dev-guide.toml
+++ b/repos/rust-lang/rustc-dev-guide.toml
@@ -17,8 +17,6 @@ infra = "write"
 lang = "write"
 lang-ops = "write"
 libs = "write"
-libs-api = "write"
-libs-contributors = "write"
 rustdoc = "write"
 rustdoc-frontend = "write"
 rustc-dev-guide = "maintain"
diff --git a/repos/rust-lang/std-dev-guide.toml b/repos/rust-lang/std-dev-guide.toml
index 2d1a5275d..c9c01742c 100644
--- a/repos/rust-lang/std-dev-guide.toml
+++ b/repos/rust-lang/std-dev-guide.toml
@@ -10,8 +10,6 @@ branch = "gh-pages"
 path = "/"
 
 [access.teams]
-libs-contributors = "write"
-libs-api = "write"
 libs = "maintain"
 rustc-dev-guide = "write"
 
diff --git a/repos/rust-lang/stdarch.toml b/repos/rust-lang/stdarch.toml
index 40ea3aaf6..215004284 100644
--- a/repos/rust-lang/stdarch.toml
+++ b/repos/rust-lang/stdarch.toml
@@ -14,8 +14,6 @@ compiler = "write"
 lang = "write"
 lang-ops = "write"
 libs = "write"
-libs-api = "write"
-libs-contributors = "write"
 
 [[rulesets]]
 pattern = "main"
diff --git a/repos/rust-lang/wg-allocators.toml b/repos/rust-lang/wg-allocators.toml
index e3f702c2e..d69d8c41c 100644
--- a/repos/rust-lang/wg-allocators.toml
+++ b/repos/rust-lang/wg-allocators.toml
@@ -6,6 +6,4 @@ bots = []
 
 [access.teams]
 libs = "write"
-libs-api = "write"
-libs-contributors = "write"
 wg-allocators = "maintain"
diff --git a/teams/libs-api.toml b/teams/archive/libs-api.toml
similarity index 88%
rename from teams/libs-api.toml
rename to teams/archive/libs-api.toml
index 1f31f697b..9abf7f9bf 100644
--- a/teams/libs-api.toml
+++ b/teams/archive/libs-api.toml
@@ -1,46 +1,40 @@
+# Library API has been incorporated into Library with RFC#3984
 name = "libs-api"
 subteam-of = "libs"
 
 [people]
 leads = []
-members = [
-    "Amanieu",
-    "BurntSushi",
-    "dtolnay",
-    "joshtriplett",
-    "the8472",
-]
+members = []
 alumni = [
     "alexcrichton",
+    "Amanieu",
     "aturon",
     "brson",
+    "BurntSushi",
+    "dtolnay",
     "Gankra",
     "huonw",
+    "joshtriplett",
     "Kimundi",
     "KodrAus",
     "LukasKalbertodt",
     "m-ou-se",
     "sfackler",
-    "withoutboats",
     "SimonSapin",
+    "the8472",
+    "withoutboats",
     "yaahc",
 ]
 
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
-[permissions]
-perf = true
-crater = true
-bors.rust.review = true
-
 [rfcbot]
 label = "T-libs-api"
 name = "Library API"
 ping = "rust-lang/libs-api"
 
 [website]
-weight = 100
 name = "Library API team"
 description = "Designing and maintaining the standard library API and guarding its stability"
 
diff --git a/teams/libs-contributors.toml b/teams/archive/libs-contributors.toml
similarity index 78%
rename from teams/libs-contributors.toml
rename to teams/archive/libs-contributors.toml
index 5558601a3..698cf63c2 100644
--- a/teams/libs-contributors.toml
+++ b/teams/archive/libs-contributors.toml
@@ -1,60 +1,49 @@
+# Library Contributors has been incorporated into Library with RFC#3984
 name = "libs-contributors"
 subteam-of = "libs"
 
 [people]
 leads = []
-members = [
+members = []
+alumni = [
+    "aapoalas",
+    "adamgemmell",
+    "calebzulawski",
+    "ChrisDenton",
+    "clarfonthey",
     "cramertj",
+    "Darksonn",
+    "davidtwco",
     "dtolnay",
+    "folkertdev",
+    "hanna-kruppe",
+    "ibraheemdev",
+    "jhpratt",
+    "joboet",
     "JohnTitor",
     "kennytm",
     "KodrAus",
+    "LawnGnome",
     "Mark-Simulacrum",
-    "SimonSapin",
-    "workingjubilee",
-    "ChrisDenton",
-    "sunfishcode",
-    "yaahc",
-    "Noratrieb",
-    "jhpratt",
-    "joboet",
-    "calebzulawski", # std::simd
-    "tgross35",
-    "ibraheemdev",
-    "folkertdev",
-    "sayantn",
     "m-ou-se",
-    "programmerjake",
-    "clarfonthey",
     "nia-e",
-    "davidtwco",
-    "adamgemmell",
-    "Darksonn",
-    "LawnGnome",
-    "aapoalas",
-    "hanna-kruppe",
-]
-alumni = [
+    "Noratrieb",
+    "programmerjake",
+    "sayantn",
     "shepmaster",
+    "SimonSapin",
+    "sunfishcode",
+    "tgross35",
+    "workingjubilee",
+    "yaahc",
 ]
 
-[permissions]
-bors.rust.review = true
-crater = true
-dev-desktop = true
-perf = true
-
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
 [website]
-weight = -100
 name = "Library contributors"
 description = "Contributing to the Rust standard library on a regular basis"
 
 [[zulip-groups]]
 name = "T-libs-contributors"
-
-[[zulip-streams]]
-name = "t-libs/reviewers"
-extra-teams = ["libs", "libs-api"]
diff --git a/teams/libs-fcp.toml b/teams/libs-fcp.toml
new file mode 100644
index 000000000..ecf320c45
--- /dev/null
+++ b/teams/libs-fcp.toml
@@ -0,0 +1,30 @@
+name = "libs-fcp"
+subteam-of = "libs"
+
+[people]
+leads = []
+members = [
+    "Amanieu",
+    "BurntSushi",
+    "cuviper",
+    "dtolnay",
+    "joshtriplett",
+    "the8472",
+    "thomcc",
+]
+alumni = []
+
+[rfcbot]
+label = "T-libs"
+name = "Library"
+ping = "rust-lang/libs"
+
+[website]
+page = "library"
+name = "Library FCP team"
+description = "Library team members with responsibility for signing off on API changes"
+zulip-stream = "t-libs"
+repo = "https://github.com/rust-lang/libs-team"
+
+[[zulip-groups]]
+name = "T-libs-fcp"
diff --git a/teams/libs.toml b/teams/libs.toml
index 63fccdbd4..76c2b71f3 100644
--- a/teams/libs.toml
+++ b/teams/libs.toml
@@ -6,14 +6,57 @@ leads = [
     "Amanieu",
 ]
 members = [
+    "aapoalas",
+    "adamgemmell",
     "Amanieu",
-    "joshtriplett",
+    "BurntSushi",
+    "Byron",
+    "calebzulawski",
+    "ChrisDenton",
+    "clarfonthey",
+    "cramertj",
     "cuviper",
+    "Darksonn",
+    "davidtwco",
+    "dtolnay",
+    "folkertdev",
+    "hanna-kruppe",
+    "ibraheemdev",
+    "jhpratt",
+    "joboet",
+    "JohnTitor",
+    "joshtriplett",
+    "kennytm",
+    "KodrAus",
+    "LawnGnome",
+    "Mark-Simulacrum",
+    "m-ou-se",
+    "nia-e",
+    "NobodyXu",
+    "Noratrieb",
+    "programmerjake",
+    "sayantn",
+    "SimonSapin",
+    "sunfishcode",
+    "tgross35",
     "the8472",
     "thomcc",
+    "workingjubilee",
+    "yaahc",
 ]
 alumni = [
+    "alexcrichton",
+    "aturon",
+    "brson",
+    "Gankra",
+    "huonw",
+    "Kimundi",
+    "LukasKalbertodt",
     "m-ou-se",
+    "sfackler",
+    "shepmaster",
+    "SimonSapin",
+    "withoutboats",
     "yaahc",
 ]
 
@@ -26,11 +69,6 @@ crater = true
 dev-desktop = true
 bors.rust.review = true
 
-[rfcbot]
-label = "T-libs"
-name = "Library"
-ping = "rust-lang/libs"
-
 [website]
 page = "library"
 name = "Library team"
@@ -44,6 +82,9 @@ address = "libs-private@rust-lang.org"
 [[lists]]
 address = "libs@rust-lang.org"
 
+[[lists]]
+address = "libs-api@rust-lang.org"
+
 [[lists]]
 address = "library-team@rust-lang.org"
 
@@ -51,5 +92,5 @@ address = "library-team@rust-lang.org"
 name = "T-libs"
 
 [[zulip-streams]]
-name = "t-libs/private"
-extra-teams = ["libs-api"]
+# NOTE: should be renamed to t-libs/private, but non-urgent
+name = "t-libs/reviewers"