diff --git a/people/Xanewok.toml b/people/Xanewok.toml
index e6700cfa1..88aa47b42 100644
--- a/people/Xanewok.toml
+++ b/people/Xanewok.toml
@@ -3,6 +3,4 @@ github = "Xanewok"
 email = "xanewok@gmail.com"
 
 [permissions]
-perf = true
-bors.rust.review = true
 bors.rls.review = true
diff --git a/people/flodiebold.toml b/people/flodiebold.toml
new file mode 100644
index 000000000..8ade88b94
--- /dev/null
+++ b/people/flodiebold.toml
@@ -0,0 +1,5 @@
+name = "Florian Diebold"
+github = "flodiebold"
+email = "flodiebold@gmail.com"
+
+
diff --git a/people/lqd.toml b/people/lqd.toml
new file mode 100644
index 000000000..906928467
--- /dev/null
+++ b/people/lqd.toml
@@ -0,0 +1,4 @@
+name = "Rémy Rakic"
+github = "lqd"
+email = "remy.rakic+rust@gmail.com"
+
diff --git a/people/matthewjasper.toml b/people/matthewjasper.toml
index 4b487643c..07247f0f8 100644
--- a/people/matthewjasper.toml
+++ b/people/matthewjasper.toml
@@ -1,7 +1,3 @@
 name = "Matthew Jasper"
 github = "matthewjasper"
 email = "mjjasper1@gmail.com"
-
-[permissions]
-crater = true
-bors.rust.review = true
diff --git a/people/nikic.toml b/people/nikic.toml
index 864086ceb..455de451d 100644
--- a/people/nikic.toml
+++ b/people/nikic.toml
@@ -1,5 +1,3 @@
 name = "Nikita Popov"
 github = "nikic"
-
-[permissions]
-bors.rust.review = true
+email = "nikita.ppv@gmail.com"
diff --git a/people/nnethercote.toml b/people/nnethercote.toml
index 5363857cd..65b75182c 100644
--- a/people/nnethercote.toml
+++ b/people/nnethercote.toml
@@ -1,6 +1,3 @@
 name = "Nicholas Nethercote"
 github = "nnethercote"
-
-[permissions]
-perf = true
-bors.rust.review = true
+email = "n.nethercote@gmail.com"
diff --git a/people/scalexm.toml b/people/scalexm.toml
index 0a991eb36..ea09941c7 100644
--- a/people/scalexm.toml
+++ b/people/scalexm.toml
@@ -1,5 +1,3 @@
 name = "Alexandre Martin"
 github = "scalexm"
-
-[permissions]
-bors.rust.review = true
+email = "alexandre@scalexm.fr"
diff --git a/people/tmandry.toml b/people/tmandry.toml
index 3e6167184..6b72857ed 100644
--- a/people/tmandry.toml
+++ b/people/tmandry.toml
@@ -1,5 +1,3 @@
 name = "Tyler Mandry"
 github = "tmandry"
-
-[permissions]
-bors.rust.review = true
+email = "tmandry@gmail.com"
diff --git a/people/wesleywiser.toml b/people/wesleywiser.toml
index 75fdb7558..bbe8d9f27 100644
--- a/people/wesleywiser.toml
+++ b/people/wesleywiser.toml
@@ -1,6 +1,3 @@
 name = "Wesley Wiser"
 github = "wesleywiser"
 email = "wwiser@gmail.com"
-
-[permissions]
-bors.rust.review = true
diff --git a/people/zackmdavis.toml b/people/zackmdavis.toml
index f3e4d8ad0..d1c2dee17 100644
--- a/people/zackmdavis.toml
+++ b/people/zackmdavis.toml
@@ -1,5 +1,3 @@
 name = "Zack M. Davis"
 github = "zackmdavis"
-
-[permissions]
-bors.rust.review = true
+email = false
diff --git a/teams/compiler-contributors.toml b/teams/compiler-contributors.toml
new file mode 100644
index 000000000..4ff3588a0
--- /dev/null
+++ b/teams/compiler-contributors.toml
@@ -0,0 +1,30 @@
+name = "compiler-contributors"
+subteam-of = "compiler"
+
+[people]
+leads = []
+members = [
+  "davidtwco",
+  "flodiebold",
+  "lqd",
+  "matklad",
+  "matthewjasper",
+  "nikic",
+  "nnethercote",
+  "scalexm",
+  "spastorino",
+  "tmandry",
+  "wesleywiser",
+  "Xanewok",
+  "zackmdavis",
+]
+
+[permissions]
+perf = true
+crater = true
+bors.rust.review = true
+
+[website]
+name = "Compiler team contributors"
+repo = "http://github.com/rust-lang/compiler-team"
+description = "folks who contribute on a regular basis"
diff --git a/teams/compiler.toml b/teams/compiler.toml
index aa3a83803..23112431f 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -36,6 +36,7 @@ address = "compiler-private@rust-lang.org"
 
 [[lists]]
 address = "compiler@rust-lang.org"
+extra-teams = ["compiler-contributors"]
 extra-people = [
     "arielb1",
     "jseyfried",
@@ -43,6 +44,7 @@ extra-people = [
 
 [[lists]]
 address = "compiler-team@rust-lang.org"
+extra-teams = ["compiler-contributors"]
 extra-people = [
     "arielb1",
     "jseyfried",