diff --git a/n/matrixspoilers.md b/n/matrixspoilers.md
new file mode 100644
index 0000000..faed377
--- /dev/null
+++ b/n/matrixspoilers.md
@@ -0,0 +1,39 @@
+---
+layout: null
+permalink: /n/matrixspoilers.html
+redirect_from:
+ - r/nheko.html
+ - r/matrixspoiler.html
+sitemap: false
+---
+
+The Matrix specification supports spoilers since version 1.1:
+
+* https://spec.matrix.org/latest/client-server-api/#spoiler-messages
+
+My favourite Matrix clients FluffyChat and Nheko support spoilers when
+the spoiler is formatted like `||Reason why this is a spoiler|Actually
+spoilered text.||` It can be in-line and reasonless spoilers are just
+`||spoiler goes here||`.
+
+Element Web supports whole message spoilers through the `/spoiler` command.
+I am not sure on other Elements as I barely use them for other things than
+`/devtools` command.
+
+Other clients supporting formatting such as Nheko older than [60b1a595e121e6d824cab188abac750be4459058](https://github.com/Nheko-Reborn/nheko/commit/60b1a595e121e6d824cab188abac750be4459058)
+will have to enter the HTML directly such as:
+
+```html
+Spoilered text
+```
+
+Nheko has a `/plain` command to disable formatting for that message which
+allows sending this message in plain text to help someone else.
+
+```html
+/plain Spoilered text
+```
+
+Spoilers are also supported by IRC, but not matrix-appservice-irc.
+
+* [matrix-org/matrix-appservice-irc#1548: Feature request: bridge spoilers to IRC by sending them with the same background&foreground colour (and that to Matrix as spoiler)](https://github.com/matrix-org/matrix-appservice-irc/issues/1548)
diff --git a/n/nheko.md b/n/nheko.md
deleted file mode 100644
index 58dcfda..0000000
--- a/n/nheko.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: null
-permalink: /n/nheko.html
-sitemap: false
----
-
-Nheko is my go-to cross-platform desktop client for Matrix.
-
-To do spoilers:
-
-```html
-Spoilered text
-```
-
-In order to tell this to someone else:
-
-```html
-/plain Spoilered text
-```
-