diff --git a/people/jyn514.toml b/people/jyn514.toml
new file mode 100644
index 000000000..1d31b596d
--- /dev/null
+++ b/people/jyn514.toml
@@ -0,0 +1,4 @@
+name = 'Joshua Nelson'
+github = 'jyn514'
+github-id = 23638587
+email = 'jyn514@gmail.com'
diff --git a/teams/docs-rs.toml b/teams/docs-rs.toml
new file mode 100644
index 000000000..97fd014b9
--- /dev/null
+++ b/teams/docs-rs.toml
@@ -0,0 +1,29 @@
+name = "docs-rs"
+subteam-of = "devtools"
+
+[people]
+leads = ["QuietMisdreavus"]
+members = [
+    "QuietMisdreavus",
+    "GuillaumeGomez",
+    "onur",
+    "pietroalbini",
+    "jyn514",
+]
+
+[github]
+orgs = ["rust-lang", "rust-lang-nursery"]
+
+[rfcbot]
+label = "T-docs-rs"
+name = "Docs.rs"
+ping = "rust-lang/docs-rs"
+
+[website]
+name = "Docs.rs team"
+description = "Docs.rs, the documentation hosting service for crates"
+discord-invite = "https://discord.gg/f7mTXPW"
+discord-name = "#docs-rs"
+
+[[lists]]
+address = "docs-rs@rust-lang.org"
diff --git a/teams/docsrs-ops.toml b/teams/docsrs-ops.toml
index 02fadfe18..77d2c6976 100644
--- a/teams/docsrs-ops.toml
+++ b/teams/docsrs-ops.toml
@@ -6,6 +6,7 @@ leads = []
 members = [
     "QuietMisdreavus",
     "onur",
+    "jyn514",
 ]
 
 [github]
diff --git a/teams/rustdoc.toml b/teams/rustdoc.toml
index 26e91c152..2f10135c5 100644
--- a/teams/rustdoc.toml
+++ b/teams/rustdoc.toml
@@ -2,12 +2,11 @@ name = "rustdoc"
 subteam-of = "devtools"
 
 [people]
-leads = ["QuietMisdreavus"]
+leads = ["GuillaumeGomez"]
 members = [
     "GuillaumeGomez",
     "QuietMisdreavus",
     "ollie27",
-    "onur",
     "kinnison",
 ]
 
@@ -25,7 +24,7 @@ ping = "rust-lang/rustdoc"
 
 [website]
 name = "Rustdoc team"
-description = "Documentation tools including Rustdoc and docs.rs"
+description = "Rustdoc, the documentation tool"
 discord-invite = "https://discord.gg/4yEYPuT"
 discord-name = "#rustdoc"