diff -ruN courier-imap-4.1.0.orig/imap/imapd.dist.in courier-imap-4.1.0/imap/imapd.dist.in
--- courier-imap-4.1.0.orig/imap/imapd.dist.in	2006-05-01 10:32:29 +1100
+++ courier-imap-4.1.0/imap/imapd.dist.in	2006-05-01 10:35:10 +1100
@@ -21,7 +21,7 @@
 #
 # ADDRESS=127.0.0.1
 
-ADDRESS=0
+ADDRESS=127.0.0.1
 
 ##NAME: PORT:1
 #
@@ -57,14 +57,14 @@
 #
 #  Maximum number of connections to accept from the same IP address
 
-MAXPERIP=4
+MAXPERIP=10
 
 ##NAME: PIDFILE:0
 #
 #  File where couriertcpd will save its process ID
 #
 
-PIDFILE=@piddir@/imapd.pid
+PIDFILE=@piddir@/courier-imapd.pid
 
 ##NAME: TCPDOPTS:0
 #
@@ -75,10 +75,10 @@
 
 ##NAME: LOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imaps init-script
 #
 
-LOGGEROPTS="-name=imapd"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #
@@ -207,7 +207,7 @@
 # server.
 #
 
-IMAP_CHECK_ALL_FOLDERS=0
+IMAP_CHECK_ALL_FOLDERS=1
 
 ##NAME: IMAP_OBSOLETE_CLIENT:0
 #
@@ -255,7 +255,7 @@
 #
 # IMAP_USELOCKS=1 is strongly recommended when shared folders are used.
 
-IMAP_USELOCKS=1
+IMAP_USELOCKS=0
 
 ##NAME: IMAP_SHAREDINDEXFILE:0
 #
@@ -314,7 +314,7 @@
 # in a stat() of every file in each folder, at login and logout.
 #
 
-IMAP_EMPTYTRASH=Trash:7
+IMAP_EMPTYTRASH=Trash:30
 
 ##NAME: IMAP_MOVE_EXPUNGE_TO_TRASH:0
 #
@@ -327,7 +327,7 @@
 # not affected.
 #
 
-IMAP_MOVE_EXPUNGE_TO_TRASH=0
+IMAP_MOVE_EXPUNGE_TO_TRASH=1
 
 
 ##NAME: OUTBOX:0
@@ -400,7 +400,7 @@
 # The default setting is going to be NO, so you'll have to manually flip
 # it to yes.
 
-IMAPDSTART=NO
+IMAPDSTART=YES
 
 ##NAME: MAILDIRPATH:0
 #
diff -ruN courier-imap-4.1.0.orig/imap/imapd.dist.in.orig courier-imap-4.1.0/imap/imapd.dist.in.orig
--- courier-imap-4.1.0.orig/imap/imapd.dist.in.orig	2006-02-26 03:14:40 +1000
+++ courier-imap-4.1.0/imap/imapd.dist.in.orig	2006-05-01 10:32:50 +1100
@@ -263,7 +263,7 @@
 # you know what you're doing.  See README.sharedfolders for additional
 # information.
 
-IMAP_SHAREDINDEXFILE=@sysconfdir@/shared/index
+IMAP_SHAREDINDEXFILE=@sysconfdir@/@PACKAGE@/shared/index
 
 ##NAME: IMAP_ENHANCEDIDLE:0
 #
@@ -389,11 +389,11 @@
 # IMAPDSTART is not used directly.  Rather, this is a convenient flag to
 # be read by your system startup script in /etc/rc.d, like this:
 #
-#  . @sysconfdir@/imapd
+#  . @sysconfdir@/@PACKAGE@/imapd
 #
 #  case x$IMAPDSTART in
 #  x[yY]*)
-#        @libexecdir@/imapd.rc start
+#        @libexecdir@/@PACKAGE@/imapd.rc start
 #        ;;
 #  esac
 #
diff -ruN courier-imap-4.1.0.orig/imap/imapd-ssl.dist.in courier-imap-4.1.0/imap/imapd-ssl.dist.in
--- courier-imap-4.1.0.orig/imap/imapd-ssl.dist.in	2006-05-01 10:32:29 +1100
+++ courier-imap-4.1.0/imap/imapd-ssl.dist.in	2006-05-01 10:35:01 +1100
@@ -43,21 +43,21 @@
 #
 # SSLADDRESS=127.0.0.1
 
-SSLADDRESS=0
+SSLADDRESS=127.0.0.1
 
 ##NAME: SSLPIDFILE:0
 #
 # That's the SSL IMAP port we'll listen on.
 # Feel free to redefine MAXDAEMONS, TCPDOPTS, and MAXPERIP.
 
-SSLPIDFILE=@piddir@/imapd-ssl.pid
+SSLPIDFILE=@piddir@/courier-imaps.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                        
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imaps init-script
 #
 
-SSLLOGGEROPTS="-name=imapd-ssl"
+SSLLOGGEROPTS=""
 
 ##NAME: IMAPDSSLSTART:0
 #
@@ -72,7 +72,7 @@
 #
 #  Whether or not to start IMAP over SSL on simap port:
 
-IMAPDSSLSTART=NO
+IMAPDSSLSTART=YES
 
 ##NAME: IMAPDSTARTTLS:0
 #
@@ -104,7 +104,7 @@
 ##NAME: COURIERTLS:0
 #
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 # 
diff -ruN courier-imap-4.1.0.orig/imap/pop3d.dist.in courier-imap-4.1.0/imap/pop3d.dist.in
--- courier-imap-4.1.0.orig/imap/pop3d.dist.in	2006-05-01 10:32:29 +1100
+++ courier-imap-4.1.0/imap/pop3d.dist.in	2006-05-01 10:36:02 +1100
@@ -13,7 +13,7 @@
 ##NAME: PIDFILE:0
 #
 
-PIDFILE=@piddir@/pop3d.pid
+PIDFILE=@piddir@/courier-pop3d.pid
 
 ##NAME: MAXDAEMONS:0
 #
@@ -93,7 +93,7 @@
 #
 # IP address to listen on.  0 means all IP addresses.
 
-ADDRESS=0
+ADDRESS=127.0.0.1
 
 ##NAME: TCPDOPTS:0
 #
@@ -104,10 +104,10 @@
 
 ##NAME: LOGGEROPTS:0
 #
-# courierlogger(1) options.
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imaps init-script
 #
 
-LOGGEROPTS="-name=pop3d"
+LOGGEROPTS=""
 
 ##NAME: DEFDOMAIN:0
 #
@@ -137,7 +137,7 @@
 # with enough platforms so that people get annoyed with having to flip it to
 # YES every time.
 
-POP3DSTART=NO
+POP3DSTART=YES
 
 ##NAME: MAILDIRPATH:0
 #
diff -ruN courier-imap-4.1.0.orig/imap/pop3d-ssl.dist.in courier-imap-4.1.0/imap/pop3d-ssl.dist.in
--- courier-imap-4.1.0.orig/imap/pop3d-ssl.dist.in	2006-05-01 10:32:29 +1100
+++ courier-imap-4.1.0/imap/pop3d-ssl.dist.in	2006-05-01 10:35:25 +1100
@@ -43,27 +43,27 @@
 #
 # SSLADDRESS=127.0.0.1
 
-SSLADDRESS=0
+SSLADDRESS=127.0.0.1
 
 ##NAME: SSLPIDFILE:0
 #
 #
 #
 
-SSLPIDFILE=@piddir@/pop3d-ssl.pid
+SSLPIDFILE=@piddir@/courier-pop3s.pid
 
 ##NAME: SSLLOGGEROPTS:0
 #
-# courierlogger(1) options.                                              
+# See courierlogger(1) options and /etc/rc.d/init.d/courier-imaps init-script
 #
 
-SSLLOGGEROPTS="-name=pop3d-ssl"
+SSLLOGGEROPTS=""
 
 ##NAME: POP3DSSLSTART:0
 #
 #  Whether or not to start POP3 over SSL on spop3 port:
 
-POP3DSSLSTART=NO
+POP3DSSLSTART=YES
 
 ##NAME: POP3_STARTTLS:0
 #
@@ -91,7 +91,7 @@
 # at your own risk.  Only the basic SSL/TLS functionality is known to be
 # working. Keep this in mind as you play with the following variables.
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PROTOCOL:0
 #