diff --git a/changelogs/identity_service/newsfragments/3167.clarification b/changelogs/identity_service/newsfragments/3167.clarification
index cc70fd71..16ed8dcd 100644
--- a/changelogs/identity_service/newsfragments/3167.clarification
+++ b/changelogs/identity_service/newsfragments/3167.clarification
@@ -1 +1 @@
-Clarify that some identifiers may be lowercase prior to processing, as per [MSC2265](https://github.com/matrix-org/matrix-doc/pull/2265).
\ No newline at end of file
+Clarify that some identifiers must be case folded prior to processing, as per [MSC2265](https://github.com/matrix-org/matrix-doc/pull/2265).
diff --git a/changelogs/identity_service/newsfragments/3176.clarification b/changelogs/identity_service/newsfragments/3176.clarification
new file mode 100644
index 00000000..50fb7cd1
--- /dev/null
+++ b/changelogs/identity_service/newsfragments/3176.clarification
@@ -0,0 +1 @@
+Clarify that some identifiers must be case folded prior to processing, as per [MSC2265](https://github.com/matrix-org/matrix-doc/pull/2265).
\ No newline at end of file
diff --git a/content/appendices.md b/content/appendices.md
index aa19aeae..f3be0cc6 100644
--- a/content/appendices.md
+++ b/content/appendices.md
@@ -756,11 +756,11 @@ Represents E-Mail addresses. The `address` is the raw email address in
 other text such as real name, angle brackets or a mailto: prefix.
 
 In addition to lowercasing the domain component of an email address,
-implementations are expected to lowercase the localpart as described
-in [the unicode mapping file](https://www.unicode.org/Public/8.0.0/ucd/CaseFolding.txt)
-prior to any processing. For example, `Strauß@Example.com` must be
-considered to be `strauss@example.com` while processing the email
-address.
+implementations are expected to apply the unicode case-folding algorithm
+as described under "Caseless Matching" in
+[chapter 5 of the unicode standard](https://www.unicode.org/versions/Unicode13.0.0/ch05.pdf#G21790).
+For example, `Strauß@Example.com` must be considered to be `strauss@example.com`
+while processing the email address.
 
 ### PSTN Phone numbers
 
diff --git a/proposals/2265-email-lowercase.md b/proposals/2265-email-lowercase.md
index 5a1db682..e4fe5313 100644
--- a/proposals/2265-email-lowercase.md
+++ b/proposals/2265-email-lowercase.md
@@ -23,8 +23,8 @@ Sydent.
 This proposal suggests changing the specification of the e-mail 3PID type in
 [the Matrix spec appendices](https://matrix.org/docs/spec/appendices#pid-types)
 to mandate that, before any processing, e-mail addresses must go through a full
-case folding based on [the unicode mapping
-file](https://www.unicode.org/Public/8.0.0/ucd/CaseFolding.txt), on top of
+case folding as described under "Caseless Matching" in
+[chapter 5 of the unicode standard](https://www.unicode.org/versions/Unicode13.0.0/ch05.pdf#G21790), on top of
 having their domain lowercased.
 
 This means that `Strauß@Example.com` must be considered as being the same e-mail