diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd862e33a9..35e6efad4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Main
 
+- Feature: Add `SSL_CERTIFICATE_ISSUERS` setting for customizing Telnet+SSL.
 - Contrib: Refactored `dice.roll` contrib function to use `safe_eval`. Can now
   optionally be used as `dice.roll("2d10 + 4 > 10")`. Old way works too.
 
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index 381e8d7ec7..60202cce7a 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -36,14 +36,7 @@ _PRIVATE_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl.key")
 _PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl-public.key")
 _CERTIFICATE_FILE = os.path.join(_GAME_DIR, "server", "ssl.cert")
 _CERTIFICATE_EXPIRE = 365 * 24 * 60 * 60 * 20  # 20 years
-_CERTIFICATE_ISSUER = {
-    "C": "EV",
-    "ST": "Evennia",
-    "L": "Evennia",
-    "O": "Evennia Security",
-    "OU": "Evennia Department",
-    "CN": "evennia",
-}
+_CERTIFICATE_ISSUER = settings.SSL_CERTIFICATE_ISSUER
 
 # messages
 
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index c27b9d6034..931d196647 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -49,6 +49,16 @@ SSL_ENABLED = False
 SSL_PORTS = [4003]
 # Telnet+SSL Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
 SSL_INTERFACES = ["0.0.0.0"]
+# Telnet+SSL certificate issuers. Don't change unless you have issues, e.g. CN may need to be
+# changed to your server's hostname.
+SSL_CERTIFICATE_ISSUER = {
+    "C": "EV",
+    "ST": "Evennia",
+    "L": "Evennia",
+    "O": "Evennia Security",
+    "OU": "Evennia Department",
+    "CN": "evennia",
+}
 # OOB (out-of-band) telnet communication allows Evennia to communicate
 # special commands and data with enabled Telnet clients. This is used
 # to create custom client interfaces over a telnet connection. To make