diff --git a/repos/rust-lang/mentorship-team.toml b/repos/rust-lang/mentorship-team.toml
new file mode 100644
index 000000000..d42be4c58
--- /dev/null
+++ b/repos/rust-lang/mentorship-team.toml
@@ -0,0 +1,7 @@
+org = "rust-lang"
+name = "mentorship-team"
+description = "Home of the Rust mentorship team"
+bots = ["rustbot", "rfcbot"]
+
+[access.teams]
+mentorship = "maintain"
diff --git a/teams/mentorship-programs.toml b/teams/mentors.toml
similarity index 68%
rename from teams/mentorship-programs.toml
rename to teams/mentors.toml
index 513eecfc9..122da6dbc 100644
--- a/teams/mentorship-programs.toml
+++ b/teams/mentors.toml
@@ -1,11 +1,9 @@
-name = "mentorship-programs"
-subteam-of = "launching-pad"
+name = "mentors"
+kind = "marker-team"
+subteam-of = "mentorship"
 
 [people]
-leads = [
-    "Kobzol",
-    "jackh726"
-]
+leads = []
 members = [
     "Kobzol",
     "jackh726",
diff --git a/teams/mentorship.toml b/teams/mentorship.toml
new file mode 100644
index 000000000..992ab6384
--- /dev/null
+++ b/teams/mentorship.toml
@@ -0,0 +1,30 @@
+name = "mentorship"
+subteam-of = "launching-pad"
+
+[people]
+leads = [
+    "Kobzol",
+    "jackh726"
+]
+members = [
+    "Kobzol",
+    "jackh726",
+]
+alumni = []
+
+[[github]]
+orgs = ["rust-lang"]
+
+[rfcbot]
+label = "T-mentorship"
+name = "Mentorship"
+ping = "rust-lang/mentorship"
+
+[website]
+name = "Mentorship team"
+description = "Manages involvement of Rust in mentorship and internship programs"
+repo = "http://github.com/rust-lang/mentorship-team"
+zulip-stream = "gsoc"
+
+[[zulip-groups]]
+name = "T-mentorship"