diff -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/imap/make_md5.c cyrus-imapd-2.3.11/imap/make_md5.c
--- cyrus-imapd-2.3.11.orig/imap/make_md5.c	2007-10-01 20:35:59.000000000 +0200
+++ cyrus-imapd-2.3.11/imap/make_md5.c	2008-09-01 11:16:50.000000000 +0200
@@ -814,7 +814,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 -Nru -x'*.orig' cyrus-imapd-2.3.11.orig/lib/imapoptions cyrus-imapd-2.3.11/lib/imapoptions
--- cyrus-imapd-2.3.11.orig/lib/imapoptions	2007-10-18 20:14:48.000000000 +0200
+++ cyrus-imapd-2.3.11/lib/imapoptions	2008-09-01 11:16:50.000000000 +0200
@@ -557,10 +557,14 @@
    mailspool, but each have their own "replicated" copy of
    mailboxes.db. */
 
-{ "md5_dir", NULL, STRING }
+{ "md5_dir", "/var/lib/imap/md5", 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).
+.PP
+   Note: This Invoca RPM build uses \fI/var/lib/imap/md5\fR by default
+   instead of \fI/var/imap/md5\fR for \fBmd5_dir\fR. */
 
 { "md5_user_map", NULL, STRING }
 /* Map file (cdb) to allow partial make_md5 runs. Maps username to UID */