diff -Naur cyrus-imapd-2.3.13.orig/imap/make_md5.c cyrus-imapd-2.3.13/imap/make_md5.c
--- cyrus-imapd-2.3.13.orig/imap/make_md5.c	2008-10-02 16:05:44.000000000 +0200
+++ cyrus-imapd-2.3.13/imap/make_md5.c	2008-10-21 15:27:21.000000000 +0200
@@ -857,7 +857,7 @@
     if (!md5_dir) md5_dir = config_getstring(IMAPOPT_MD5_DIR);
 
     if (!md5_dir)
-        md5_dir = xstrdup("/var/imap/md5");
+        md5_dir = xstrdup("/var/lib/imap/md5");
 
     if (max_children == 0) {
         /* Simple case */
diff -Naur cyrus-imapd-2.3.13.orig/imap/make_sha1.c cyrus-imapd-2.3.13/imap/make_sha1.c
--- cyrus-imapd-2.3.13.orig/imap/make_sha1.c	2008-10-02 16:05:44.000000000 +0200
+++ cyrus-imapd-2.3.13/imap/make_sha1.c	2008-10-21 15:27:21.000000000 +0200
@@ -854,7 +854,7 @@
     if (!sha1_dir) sha1_dir = config_getstring(IMAPOPT_SHA1_DIR);
 
     if (!sha1_dir)
-        sha1_dir = xstrdup("/var/imap/sha1");
+        sha1_dir = xstrdup("/var/lib/imap/sha1");
 
     if (max_children == 0) {
         /* Simple case */
diff -Naur cyrus-imapd-2.3.13.orig/lib/imapoptions cyrus-imapd-2.3.13/lib/imapoptions
--- cyrus-imapd-2.3.13.orig/lib/imapoptions	2008-10-08 19:18:12.000000000 +0200
+++ cyrus-imapd-2.3.13/lib/imapoptions	2008-10-21 15:28:59.000000000 +0200
@@ -588,7 +588,7 @@
 { "md5_dir", NULL, STRING }
 /* Top level directory for MD5 store manipulated by make_md5. File
    structure within this directory is one file for each user on the system,
-   hashed on the first letter of the userid (e.g., /var/imap/md5/d/dpc22). */
+   hashed on the first letter of the userid (e.g:, /var/lib/imap/md5/d/dpc22). */
 
 { "md5_user_map", NULL, STRING }
 /* Map file (cdb) to allow partial make_md5 runs. Maps username to UID */
@@ -908,7 +908,7 @@
 { "sha1_dir", NULL, STRING }
 /* Top level directory for SHA1 store manipulated by make_sha1. File
    structure within this directory is one file for each user on the system,
-   hashed on the first letter of the userid (e.g: /var/imap/sha1/d/dpc22). */
+   hashed on the first letter of the userid (e.g: /var/lib/imap/sha1/d/dpc22). */
 
 { "sharedprefix", "Shared Folders", STRING }
 /* If using the alternate IMAP namespace, the prefix for the shared