diff --git a/src/SUMMARY.md b/src/SUMMARY.md
index 0a9dc7773..5d6852f23 100644
--- a/src/SUMMARY.md
+++ b/src/SUMMARY.md
@@ -29,9 +29,10 @@
     - [Emitting Errors and other Diagnostics](diagnostics.md)
         - [`LintStore`](./diagnostics/lintstore.md)
         - [Diagnostic Codes](./diagnostics/diagnostic-codes.md)
-    - [ICE-breaker teams](ice-breaker/about.md)
-        - ["Cleanup Crew" ICE-breakers](ice-breaker/cleanup-crew.md)
-        - [LLVM ICE-breakers](ice-breaker/llvm.md)
+    - [Notification groups](notification-groups/about.md)
+        - ["Cleanup Crew"](notification-groups/cleanup-crew.md)
+        - [LLVM](notification-groups/llvm.md)
+        - [Windows](notification-groups/windows.md)
     - [Licenses](./licenses.md)
 - [Part 2: High-level Compiler Architecture](./part-2-intro.md)
     - [Overview of the Compiler](./overview.md)
diff --git a/src/ice-breaker/about.md b/src/notification-groups/about.md
similarity index 100%
rename from src/ice-breaker/about.md
rename to src/notification-groups/about.md
diff --git a/src/ice-breaker/cleanup-crew.md b/src/notification-groups/cleanup-crew.md
similarity index 100%
rename from src/ice-breaker/cleanup-crew.md
rename to src/notification-groups/cleanup-crew.md
diff --git a/src/ice-breaker/llvm.md b/src/notification-groups/llvm.md
similarity index 77%
rename from src/ice-breaker/llvm.md
rename to src/notification-groups/llvm.md
index a6291a8c2..d657231f2 100644
--- a/src/ice-breaker/llvm.md
+++ b/src/notification-groups/llvm.md
@@ -1,10 +1,10 @@
-# LLVM ICE-breakers
+# LLVM Notification group
 
-**Github Label:** [ICEBreaker-LLVM]
+**Github Label:** [A-LLVM]
 
-[ICEBreaker-LLVM]: https://github.com/rust-lang/rust/labels/ICEBreaker-LLVM
+[A-LLVM]: https://github.com/rust-lang/rust/labels/A-LLVM
 
-The "LLVM ICE-breakers" are focused on bugs that center around LLVM.
+The "LLVM Notification Group" are focused on bugs that center around LLVM.
 These bugs often arise because of LLVM optimizations gone awry, or as
 the result of an LLVM upgrade. The goal here is:
 
@@ -13,6 +13,9 @@ the result of an LLVM upgrade. The goal here is:
 - if the former, to fix our IR;
 - if the latter, to try and file a bug on LLVM (or identify an existing bug).
 
+The group may also be asked to weigh in on other sorts of LLVM-focused
+questions.
+
 ## Helpful tips and options
 
 The ["Debugging LLVM"][d] section of the
diff --git a/src/notification-groups/windows.md b/src/notification-groups/windows.md
new file mode 100644
index 000000000..328ee6480
--- /dev/null
+++ b/src/notification-groups/windows.md
@@ -0,0 +1,31 @@
+# Windows notification group
+
+**Github Label:** [O-Windows]
+
+[O-Windows]: https://github.com/rust-lang/rust/labels/O-Windows
+
+This list will be used to ask for help both in diagnosing and testing
+Windows-related issues as well as suggestions on how to resolve
+interesting questions regarding our Windows support.
+
+The group also has an associated Zulip stream (`#t-compiler/windows`)
+where people can go to pose questions and discuss Windows-specific
+topics.
+
+To get a better idea for what the group will do, here are some
+examples of the kinds of questions where we would have reached out to
+the group for advice in determining the best course of action:
+
+* Which versions of MinGW should we support?
+* Should we remove the legacy InnoSetup GUI installer? [#72569]
+* What names should we use for static libraries on Windows? [#29520] 
+
+So, if you are interested in participating, please sign up for the
+Windows group! To do so, you open a PR against the [rust-lang/team]
+repository. Just [follow this example][eg], but change the username to
+your own!
+
+[rust-lang/team]: https://github.com/rust-lang/team
+[eg]: https://github.com/rust-lang/team/pull/348/
+[#72569]: https://github.com/rust-lang/rust/pull/72569
+[#29520]: https://github.com/rust-lang/rust/pull/29520