diff --git a/changelog.d/10804.doc b/changelog.d/10804.doc
new file mode 100644
index 0000000000000000000000000000000000000000..5d57af3b5fa0ac83adcc4df3d0048800a51be8c5
--- /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 e15a83222014d9b0652980ae78af157bbe7644f1..95cca16552fc92963583fb72f565a0d8f487badf 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 53809cee2ecd791ca6d97526e0abb40d7d7da358..ba8bf9cbe7d4d4de93da1b1d3402de2196f7b64c 100644
--- a/synapse/config/auth.py
+++ b/synapse/config/auth.py
@@ -88,7 +88,7 @@ class AuthConfig(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