diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d0e757c..9aaa8381 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+In Development
+--------------
+
+Control Panel:
+
+* Installing your own TLS/SSL certificate had been broken since v0.24 because the new version of openssl became stricter about CSR generation parameters.
+
 v0.26b (January 25, 2018)
 -------------------------
 
diff --git a/management/ssl_certificates.py b/management/ssl_certificates.py
index 19d02dee..c6b5080f 100755
--- a/management/ssl_certificates.py
+++ b/management/ssl_certificates.py
@@ -556,7 +556,7 @@ def create_csr(domain, ssl_key, country_code, env):
                 "openssl", "req", "-new",
                 "-key", ssl_key,
                 "-sha256",
-                "-subj", "/C=%s/ST=/L=/O=/CN=%s" % (country_code, domain)])
+                "-subj", "/C=%s/CN=%s" % (country_code, domain)])
 
 def install_cert(domain, ssl_cert, ssl_chain, env, raw=False):
 	# Write the combined cert+chain to a temporary path and validate that it is OK.