diff --git a/config/fail2ban.conf.default b/config/fail2ban.conf.default
index a5b69b06..96337fcd 100644
--- a/config/fail2ban.conf.default
+++ b/config/fail2ban.conf.default
@@ -11,12 +11,6 @@
 #
 background = false
 
-# Option:  debug
-# Notes.:  enable debug mode. More verbose output and bypass root user test.
-# Values:  [true | false]  Default:  false
-#
-debug = false
-
 # Option:  logtargets
 # Notes.:  log targets. Space separated list of logging targets.
 # Values:  STDERR SYSLOG file  Default:  /var/log/fail2ban.log
@@ -120,6 +114,19 @@ host = localhost
 #
 port = 25
 
+# Option:  user
+# Notes.:  the username for smtp-server if authentification is required.
+#          if user is empty, no authentification is done.
+# Values:  STR  Default:  
+#
+user = 
+
+# Option:  password
+# Notes.:  the smtp-user's password if authentification is required.
+# Values:  STR  Default:  
+#
+password = 
+
 # Option:  from
 # Notes.:  e-mail address of the sender.
 # Values:  MAIL  Default:  fail2ban
@@ -229,7 +236,8 @@ fwban = iptables -I fail2ban-http 1 -s <ip> -j DROP
 fwunban = iptables -D fail2ban-http -s <ip> -j DROP
 
 # Option:  timeregex
-# Notes.:  regex to match timestamp in Apache logfile.
+# Notes.:  regex to match timestamp in Apache logfile. For TAI64N format,
+#          use timeregex = @[0-9a-f]{24}
 # Values:  [Wed Jan 05 15:08:01 2005]
 # Default: \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
 #
@@ -237,7 +245,8 @@ timeregex = \S{3} \S{3} \d{2} \d{2}:\d{2}:\d{2} \d{4}
 
 # Option:  timepattern
 # Notes.:  format used in "timeregex" fields definition. Note that '%' must be
-#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule)
+#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule).
+#          For TAI64N format, use timepattern = tai64n
 # Values:  TEXT  Default:  %%a %%b %%d %%H:%%M:%%S %%Y
 #
 timepattern = %%a %%b %%d %%H:%%M:%%S %%Y
@@ -308,7 +317,8 @@ fwban = iptables -I fail2ban-ssh 1 -s <ip> -j DROP
 fwunban = iptables -D fail2ban-ssh -s <ip> -j DROP
 
 # Option:  timeregex
-# Notes.:  regex to match timestamp in SSH logfile.
+# Notes.:  regex to match timestamp in SSH logfile. For TAI64N format,
+#          use timeregex = @[0-9a-f]{24}
 # Values:  [Mar  7 17:53:28]
 # Default: \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
 #
@@ -316,7 +326,8 @@ timeregex = \S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}
 
 # Option:  timepattern
 # Notes.:  format used in "timeregex" fields definition. Note that '%' must be
-#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule)
+#          escaped with '%' (see http://rgruet.free.fr/PQR2.3.html#timeModule).
+#          For TAI64N format, use timepattern = tai64n
 # Values:  TEXT  Default:  %%b %%d %%H:%%M:%%S
 #
 timepattern = %%b %%d %%H:%%M:%%S