diff --git a/data/default_config.cfg b/data/default_config.cfg
index a1149452..ac2e245e 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -10,6 +10,15 @@ server = anon.louiz.org
 # the port you'll use to connect
 port = 5222
 
+# SSL Certificate fingerprint
+# Do not touch this if you don’t know what you are doing
+certificate =
+
+# Skip the SSL verification
+# Should be true in most cases, as you want to check that the server keeps
+# the same certificate.
+ignore_certificate = false
+
 # Auto-reconnects you when you get disconnected from the server
 # defaults to false because it should not be necessary
 auto_reconnect = false
diff --git a/doc/en/configure.txt b/doc/en/configure.txt
index afe24f3e..4f69084e 100644
--- a/doc/en/configure.txt
+++ b/doc/en/configure.txt
@@ -48,6 +48,17 @@ section of this documentation.
 
  The port you’ll use to connect.
 
+*certificate*:: [empty]
+
+  The fingerprint of the SSL certificate as a hexadecimal string, you should
+  not touch it, except if know what you are doing.
+
+*ignore_certificate*:: false
+
+  Skip certificate validation on connection when _true_. Useful when you are in
+  anonymous mode and changing servers often. Dangerous in other cases, from a
+  security perspective.
+
 *resource*:: [empty]
 
   the resource you will use