diff -Naur cyrus-imapd-2.4.17.orig/doc/man/imapd.conf.5.html cyrus-imapd-2.4.17/doc/man/imapd.conf.5.html
--- cyrus-imapd-2.4.17.orig/doc/man/imapd.conf.5.html	2012-12-01 20:59:55.000000000 +0100
+++ cyrus-imapd-2.4.17/doc/man/imapd.conf.5.html	2013-01-03 23:22:20.000000000 +0100
@@ -2110,11 +2110,10 @@
 <i>skiplist</i>, <i>sql</i></p>
 
 <p style="margin-left:11%;"><b>tlscache_db_path:</b>
-&lt;none&gt;</p>
+{configdirectory}/volatile/tls_sessions.db;</p>
 
 <p style="margin-left:18%;">The absolute path to the
-tlscache db file. If not specified, will be
-confdir/tls_sessions.db</p>
+tlscache db file.</p>
 
 <p style="margin-left:11%;"><b>tls_cert_file:</b>
 &lt;none&gt;</p>
diff -Naur cyrus-imapd-2.4.17.orig/lib/imapoptions cyrus-imapd-2.4.17/lib/imapoptions
--- cyrus-imapd-2.4.17.orig/lib/imapoptions	2012-12-01 20:57:54.000000000 +0100
+++ cyrus-imapd-2.4.17/lib/imapoptions	2013-01-03 23:23:35.000000000 +0100
@@ -1326,9 +1326,8 @@
 { "tlscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql")}
 /* The cyrusdb backend to use for the TLS cache. */
 
-{ "tlscache_db_path", NULL, STRING }
-/* The absolute path to the tlscache db file.  If not specified,
-   will be confdir/tls_sessions.db */
+{ "tlscache_db_path", "{configdirectory}/volatile/tls_sessions.db", STRING }
+/* The absolute path to the tlscache db file. */
 
 { "tls_cert_file", NULL, STRING }
 /* File containing the certificate presented for server authentication
diff -Naur cyrus-imapd-2.4.17.orig/lib/imapopts.c cyrus-imapd-2.4.17/lib/imapopts.c
--- cyrus-imapd-2.4.17.orig/lib/imapopts.c	2012-12-01 20:59:51.000000000 +0100
+++ cyrus-imapd-2.4.17/lib/imapopts.c	2013-01-03 23:24:19.000000000 +0100
@@ -852,7 +852,7 @@
       { "sql" , IMAP_ENUM_ZERO },
       { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_TLSCACHE_DB_PATH, "tlscache_db_path", 0, OPT_STRING,
-    {(void *)(NULL)},
+    {(void *)("{configdirectory}/volatile/tls_sessions.db")},
     { { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_TLS_CERT_FILE, "tls_cert_file", 0, OPT_STRING,
     {(void *)(NULL)},
diff -Naur cyrus-imapd-2.4.17.orig/man/imapd.conf.5 cyrus-imapd-2.4.17/man/imapd.conf.5
--- cyrus-imapd-2.4.17.orig/man/imapd.conf.5	2012-12-01 20:59:51.000000000 +0100
+++ cyrus-imapd-2.4.17/man/imapd.conf.5	2013-01-03 23:25:45.000000000 +0100
@@ -1122,9 +1122,8 @@
 The cyrusdb backend to use for the TLS cache. 
 
 Allowed values: \fIberkeley\fR, \fIberkeley-nosync\fR, \fIberkeley-hash\fR, \fIberkeley-hash-nosync\fR, \fIskiplist\fR, \fIsql\fR
-.IP "\fBtlscache_db_path:\fR <none>" 5
-The absolute path to the tlscache db file.  If not specified,
-will be confdir/tls_sessions.db 
+.IP "\fBtlscache_db_path:\fR {configdirectory}/volatile/tls_sessions.db" 5
+The absolute path to the tlscache db file. 
 .IP "\fBtls_cert_file:\fR <none>" 5
 File containing the certificate presented for server authentication
 during STARTTLS.  A value of "disabled" will disable SSL/TLS.