diff --git a/triagebot.toml b/triagebot.toml
index 86c7dea8d6e..5fc58ab9615 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -8,10 +8,13 @@
 [relabel]
 allow-unauthenticated = [
     "needs-triage",
+    "S-*",
+    "C-*",
 ]
 
-[autolabel."pr-not-reviewed"]
-new_pr = true
+# ------------------------------------------------------------------------------
+# General autolabels
+# ------------------------------------------------------------------------------
 
 [autolabel."needs-triage"]
 new_issue = true
@@ -19,6 +22,38 @@ exclude_labels = [
     "C-tracking-issue",
 ]
 
+# ------------------------------------------------------------------------------
+# PR review
+# ------------------------------------------------------------------------------
+
+[autolabel."S-waiting-on-review"]
+new_pr = true
+
+[autolabel."S-waiting-on-author"]
+new_draft = true
+
+[review-submitted]
+# This label is added when a "request changes" review is submitted.
+reviewed_label = "S-waiting-on-author"
+# These labels are removed when a "request changes" review is submitted.
+review_labels = ["S-waiting-on-review"]
+
+[review-requested]
+# Those labels are removed when PR author requests a review from an assignee
+remove_labels = ["S-waiting-on-author"]
+# Those labels are added when PR author requests a review from an assignee
+add_labels = ["S-waiting-on-review"]
+
+# Adds at the end of a review body a link to view the changes that happened
+# since the review
+# Documentation at: https://forge.rust-lang.org/triagebot/review-changes-since.html
+[review-changes-since]
+
+# Allow reviewers and authors to easily flip between {`S-waiting-on-review`,
+# `S-waiting-on-author`, `S-blocked`}.
+# Documentation at: <https://forge.rust-lang.org/triagebot/shortcuts.html>
+[shortcut]
+
 # ------------------------------------------------------------------------------
 # PR assignments
 # ------------------------------------------------------------------------------