ChatSecure · chrisballinger · Apr 25, 2017 · Apr 23, 2017 · Apr 23, 2017 · Apr 23, 2017
diff --git a/README.md b/README.md
@@ -27,7 +27,14 @@ Example:
 ```
 # Certificates
 
-For the `certificate` key we need the certs in 'der' format, converted to base64 with no linebreaks. You can get the certificate in PEM format from the result on xmpp.net, which needs to be converted:
+For the `certificate` key we need the certificate in 'der' format, converted to base64 with no linebreaks.
 
-    $ openssl x509 -outform der -in certificate.pem -out certificate.cer
-    $ openssl enc -base64 -A -in certificate.cer -out certificate.cer.base64
+You can get the certificate in PEM format from the result on xmpp.net, which needs to be converted:
+
+    $ openssl x509 -outform der -in certificate.pem | openssl enc -base64 -A -out certificate.cer.base64
+
+Or you can get it directly from the XMPP server:
+
+    $ openssl s_client -starttls xmpp -showcerts -connect <server.address>:5222 < /dev/null 2>/dev/null | openssl x509 -outform der | openssl enc -base64 -A -out certificate.cer.base64
+
+Option `-starttls xmpp` should only be used for servers using STARTTLS. When in doubt try with and without it.
diff --git a/images/chatme.png b/images/chatme.png
diff --git a/images/creep.png b/images/creep.png
diff --git a/images/hotchilli.png b/images/hotchilli.png
diff --git a/images/suchat.png b/images/suchat.png
diff --git a/images/systemausfall.png b/images/systemausfall.png
diff --git a/servers.json b/servers.json