diff --git a/src/SUMMARY.md b/src/SUMMARY.md
index 6bc19e62d..a51fcee90 100644
--- a/src/SUMMARY.md
+++ b/src/SUMMARY.md
@@ -58,8 +58,11 @@
     - [Apple](notification-groups/apple.md)
     - [ARM](notification-groups/arm.md)
     - [Cleanup Crew](notification-groups/cleanup-crew.md)
+    - [Emscripten](notification-groups/emscripten.md)
     - [LLVM](notification-groups/llvm.md)
     - [RISC-V](notification-groups/risc-v.md)
+    - [WASI](notification-groups/wasi.md)
+    - [WebAssembly](notification-groups/wasm.md)
     - [Windows](notification-groups/windows.md)
     - [Rust for Linux](notification-groups/rust-for-linux.md)
 - [Licenses](./licenses.md)
diff --git a/src/notification-groups/about.md b/src/notification-groups/about.md
index 23a8d7f79..77bd868d1 100644
--- a/src/notification-groups/about.md
+++ b/src/notification-groups/about.md
@@ -22,8 +22,11 @@ Here's the list of the notification groups:
 - [Apple](./apple.md)
 - [ARM](./arm.md)
 - [Cleanup Crew](./cleanup-crew.md)
+- [Emscripten](./emscripten.md)
 - [LLVM](./llvm.md)
 - [RISC-V](./risc-v.md)
+- [WASI](./wasi.md)
+- [WebAssembly](./wasm.md)
 - [Windows](./windows.md)
 - [Rust for Linux](./rust-for-linux.md)
 
@@ -62,8 +65,11 @@ Example PRs:
 * [Example of adding yourself to the Apple group.](https://github.com/rust-lang/team/pull/1434)
 * [Example of adding yourself to the ARM group.](https://github.com/rust-lang/team/pull/358)
 * [Example of adding yourself to the Cleanup Crew.](https://github.com/rust-lang/team/pull/221)
+* [Example of adding yourself to the Emscripten group.](https://github.com/rust-lang/team/pull/1579)
 * [Example of adding yourself to the LLVM group.](https://github.com/rust-lang/team/pull/140)
 * [Example of adding yourself to the RISC-V group.](https://github.com/rust-lang/team/pull/394)
+* [Example of adding yourself to the WASI group.](https://github.com/rust-lang/team/pull/1580)
+* [Example of adding yourself to the WebAssembly group.](https://github.com/rust-lang/team/pull/1581)
 * [Example of adding yourself to the Windows group.](https://github.com/rust-lang/team/pull/348)
 
 ## Tagging an issue for a notification group
@@ -74,10 +80,14 @@ group. For example:
 
 ```text
 @rustbot ping apple
-@rustbot ping llvm
+@rustbot ping arm
 @rustbot ping cleanup-crew
+@rustbot ping emscripten
+@rustbot ping llvm
+@rustbot ping risc-v
+@rustbot ping wasi
+@rustbot ping wasm
 @rustbot ping windows
-@rustbot ping arm
 ```
 
 To make some commands shorter and easier to remember, there are aliases,
diff --git a/src/notification-groups/emscripten.md b/src/notification-groups/emscripten.md
new file mode 100644
index 000000000..100dbdf9f
--- /dev/null
+++ b/src/notification-groups/emscripten.md
@@ -0,0 +1,23 @@
+# Emscripten notification group
+
+**Github Label:** [O-emscripten] <br>
+**Ping command:** `@rustbot ping emscripten`
+
+[O-emscripten]: https://github.com/rust-lang/rust/labels/O-emscripten
+
+This list will be used to ask for help both in diagnosing and testing
+Emscripten-related issues as well as suggestions on how to resolve
+interesting questions regarding our Emscripten support.
+
+The group also has an associated Zulip stream ([`#t-compiler/wasm`])
+where people can go to pose questions and discuss Emscripten-specific
+topics.
+
+So, if you are interested in participating, please sign up for the
+Emscripten group! To do so, open a PR against the [rust-lang/team]
+repository. Just [follow this example][eg], but change the username to
+your own!
+
+[`#t-compiler/wasm`]: https://rust-lang.zulipchat.com/#narrow/stream/463513-t-compiler.2Fwasm
+[rust-lang/team]: https://github.com/rust-lang/team
+[eg]: https://github.com/rust-lang/team/pull/1579
diff --git a/src/notification-groups/wasi.md b/src/notification-groups/wasi.md
new file mode 100644
index 000000000..e438ee4bd
--- /dev/null
+++ b/src/notification-groups/wasi.md
@@ -0,0 +1,23 @@
+# WASI notification group
+
+**Github Label:** [O-wasi] <br>
+**Ping command:** `@rustbot ping wasi`
+
+[O-wasi]: https://github.com/rust-lang/rust/labels/O-wasi
+
+This list will be used to ask for help both in diagnosing and testing
+WASI-related issues as well as suggestions on how to resolve
+interesting questions regarding our WASI support.
+
+The group also has an associated Zulip stream ([`#t-compiler/wasm`])
+where people can go to pose questions and discuss WASI-specific
+topics.
+
+So, if you are interested in participating, please sign up for the
+WASI group! To do so, open a PR against the [rust-lang/team]
+repository. Just [follow this example][eg], but change the username to
+your own!
+
+[`#t-compiler/wasm`]: https://rust-lang.zulipchat.com/#narrow/stream/463513-t-compiler.2Fwasm
+[rust-lang/team]: https://github.com/rust-lang/team
+[eg]: https://github.com/rust-lang/team/pull/1580
diff --git a/src/notification-groups/wasm.md b/src/notification-groups/wasm.md
new file mode 100644
index 000000000..c8b674cb9
--- /dev/null
+++ b/src/notification-groups/wasm.md
@@ -0,0 +1,23 @@
+# WebAssembly (WASM) notification group
+
+**Github Label:** [O-wasm] <br>
+**Ping command:** `@rustbot ping wasm`
+
+[O-wasm]: https://github.com/rust-lang/rust/labels/O-wasm
+
+This list will be used to ask for help both in diagnosing and testing
+WebAssembly-related issues as well as suggestions on how to resolve
+interesting questions regarding our WASM support.
+
+The group also has an associated Zulip stream ([`#t-compiler/wasm`])
+where people can go to pose questions and discuss WASM-specific
+topics.
+
+So, if you are interested in participating, please sign up for the
+WASM group! To do so, open a PR against the [rust-lang/team]
+repository. Just [follow this example][eg], but change the username to
+your own!
+
+[`#t-compiler/wasm`]: https://rust-lang.zulipchat.com/#narrow/stream/463513-t-compiler.2Fwasm
+[rust-lang/team]: https://github.com/rust-lang/team
+[eg]: https://github.com/rust-lang/team/pull/1581