diff -Naur cyrus-imapd-2.3.1.orig/imap/make_md5.c cyrus-imapd-2.3.1/imap/make_md5.c

--- cyrus-imapd-2.3.1.orig/imap/make_md5.c	2005-12-13 16:31:08.000000000 +0100

+++ cyrus-imapd-2.3.1/imap/make_md5.c	2006-01-16 11:27:29.000000000 +0100

@@ -811,7 +811,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 (((uid_file = config_getstring(IMAPOPT_MD5_USER_MAP)) != NULL) &&

         ((uid_fd=open(uid_file, O_RDONLY)) < 0)) {

diff -Naur cyrus-imapd-2.3.1.orig/lib/imapoptions cyrus-imapd-2.3.1/lib/imapoptions

--- cyrus-imapd-2.3.1.orig/lib/imapoptions	2005-12-13 20:36:11.000000000 +0100

+++ cyrus-imapd-2.3.1/lib/imapoptions	2006-01-16 11:26:54.000000000 +0100

@@ -527,10 +527,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 */