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-02 16:43:12.000000000 +0100
@@ -1087,10 +1087,9 @@
 confdir/mailboxes.db</p>
 
 <p style="margin-left:11%;"><b>mboxname_lockpath:</b>
-&lt;none&gt;</p>
+{configdirectory}/volatile/lock</p>
 
-<p style="margin-left:18%;">Path to mailbox name lock files
-(default $conf/lock)</p>
+<p style="margin-left:18%;">Path to mailbox name lock files.</p>
 
 <p style="margin-left:11%;"><b>metapartition_files:</b>
 &lt;empty string&gt;</p>
@@ -1466,11 +1465,10 @@
 address of &quot;+shared.blah&quot; would be used.</p>
 
 <p style="margin-left:11%;"><b>proc_path:</b>
-&lt;none&gt;</p>
+{configdirectory}/volatile/proc;</p>
 
-<p style="margin-left:18%;">Path to proc directory. Default
-is NULL - must be an absolute path if specified. If not
-specified, the path $confdir/proc/ will be used.</p>
+<p style="margin-left:18%;">Path to proc directory. Must
+be an absolute path.</p>
 
 <p style="margin-left:11%;"><b>proxy_authname:</b>
 proxy</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-02 16:38:47.000000000 +0100
@@ -685,8 +685,8 @@
 /* The absolute path to the mailboxes db file.  If not specified
    will be confdir/mailboxes.db */
 
-{ "mboxname_lockpath", NULL, STRING }
-/* Path to mailbox name lock files (default $conf/lock) */
+{ "mboxname_lockpath", "{configdirectory}/volatile/lock", STRING }
+/* Path to mailbox name lock files. */
 
 { "metapartition_files", "", BITFIELD("header", "index", "cache", "expunge", "squat") }
 /* Space-separated list of metadata files to be stored on a
@@ -951,10 +951,8 @@
    the "shared.blah" folder.  By default, an email address of
    "+shared.blah" would be used. */ 
 
-{ "proc_path", NULL, STRING }
-/* Path to proc directory.  Default is NULL - must be an absolute path
-   if specified.  If not specified, the path $confdir/proc/ will be 
-   used. */
+{ "proc_path", "{configdirectory}/volatile/proc", STRING }
+/* Path to proc directory.  Must be an absolute path. */
 
 { "proxy_authname", "proxy", STRING }
 /* The authentication name to use when authenticating to a backend server
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-02 16:38:47.000000000 +0100
@@ -408,7 +408,7 @@
     {(void *)(NULL)},
     { { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_MBOXNAME_LOCKPATH, "mboxname_lockpath", 0, OPT_STRING,
-    {(void *)(NULL)},
+    {(void *)("{configdirectory}/volatile/lock")},
     { { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_METAPARTITION_FILES, "metapartition_files", 0, OPT_BITFIELD,
     {(void *)(0)},
@@ -536,7 +536,7 @@
     {(void *)("")},
     { { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_PROC_PATH, "proc_path", 0, OPT_STRING,
-    {(void *)(NULL)},
+    {(void *)("{configdirectory}/volatile/proc")},
     { { NULL, IMAP_ENUM_ZERO } } },
   { IMAPOPT_PROXY_AUTHNAME, "proxy_authname", 0, OPT_STRING,
     {(void *)("proxy")},
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-02 16:38:47.000000000 +0100
@@ -585,8 +585,8 @@
 .IP "\fBmboxlist_db_path:\fR <none>" 5
 The absolute path to the mailboxes db file.  If not specified
 will be confdir/mailboxes.db 
-.IP "\fBmboxname_lockpath:\fR <none>" 5
-Path to mailbox name lock files (default $conf/lock) 
+.IP "\fBmboxname_lockpath:\fR {configdirectory}/volatile/lock" 5
+Path to mailbox name lock files. 
 .IP "\fBmetapartition_files:\fR <empty string>" 5
 Space-separated list of metadata files to be stored on a
 \fImetapartition\fR rather than in the mailbox directory on a spool
@@ -810,10 +810,8 @@
 set to "bb", email sent to "bb+shared.blah" would be delivered to
 the "shared.blah" folder.  By default, an email address of
 "+shared.blah" would be used. 
-.IP "\fBproc_path:\fR <none>" 5
-Path to proc directory.  Default is NULL - must be an absolute path
-if specified.  If not specified, the path $confdir/proc/ will be 
-used. 
+.IP "\fBproc_path:\fR {configdirectory}/volatile/proc" 5
+Path to proc directory.  Must be an absolute path. 
 .IP "\fBproxy_authname:\fR proxy" 5
 The authentication name to use when authenticating to a backend server
 in the Cyrus Murder. 
