diff --git a/changelog.d/10804.doc b/changelog.d/10804.doc
new file mode 100644
index 000000000000..5d57af3b5fa0
--- /dev/null
+++ b/changelog.d/10804.doc
@@ -0,0 +1 @@
+Fixed a wording mistake in the sample configuration. Contributed by @bramvdnheuvel:nltrix.net.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index e15a83222014..95cca16552fc 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -2086,7 +2086,7 @@ password_config:
       #
       #require_lowercase: true
 
-      # Whether a password must contain at least one lowercase letter.
+      # Whether a password must contain at least one uppercase letter.
       # Defaults to 'false'.
       #
       #require_uppercase: true
diff --git a/synapse/config/auth.py b/synapse/config/auth.py
index 53809cee2ecd..ba8bf9cbe7d4 100644
--- a/synapse/config/auth.py
+++ b/synapse/config/auth.py
@@ -88,7 +88,7 @@ def generate_config_section(self, config_dir_path, server_name, **kwargs):
               #
               #require_lowercase: true
 
-              # Whether a password must contain at least one lowercase letter.
+              # Whether a password must contain at least one uppercase letter.
               # Defaults to 'false'.
               #
               #require_uppercase: true