diff -Naur kolabd-2.1.0/templates/cyrus.conf.template.in kolabd-2.1.0.oden/templates/cyrus.conf.template.in
--- kolabd-2.1.0/templates/cyrus.conf.template.in	2007-05-31 12:58:16.000000000 +0200
+++ kolabd-2.1.0.oden/templates/cyrus.conf.template.in	2007-05-31 12:56:29.000000000 +0200
@@ -18,13 +18,13 @@
   recover	cmd="ctl_cyrusdb -r"
 
   # this is only necessary if using idled for IMAP IDLE
-  #idled		cmd="idled"
+#  idled		cmd="idled"
 
   # Initial mupdate syncronisation
-  #mupdatepush   cmd="ctl_mboxlist -m"
+#  mupdatepush   cmd="ctl_mboxlist -m"
 }
 
-# UNIX sockets start with a slash and are put into /openpkg/var/imapd/sockets
+# UNIX sockets start with a slash and are put into /var/lib/imap/sockets
 SERVICES {
   @@@cyrus-imap@@@
   @@@cyrus-imaps@@@
@@ -32,6 +32,10 @@
   @@@cyrus-pop3s@@@
   @@@cyrus-sieve@@@
 
+# these are only necessary if receiving/exporting usenet via NNTP
+#  nntp		cmd="nntpd" listen="nntp" prefork=3
+#  nntps	cmd="nntpd -s" listen="nntps" prefork=1
+
 #@@@if is-master@@@
 #  mupdate       cmd="mupdate -m" listen=3905 prefork=1
 #@@@endif@@@
diff -Naur kolabd-2.1.0/templates/imapd.conf.template.in kolabd-2.1.0.oden/templates/imapd.conf.template.in
--- kolabd-2.1.0/templates/imapd.conf.template.in	2007-05-31 12:58:16.000000000 +0200
+++ kolabd-2.1.0.oden/templates/imapd.conf.template.in	2007-05-31 12:57:41.000000000 +0200
@@ -80,8 +80,8 @@
 mailnotifier: mailto
 
 # use berkeley db backend instead of skiplist
-annotation_db: berkeley
-mboxlist_db: berkeley
+#annotation_db: berkeley
+#mboxlist_db: berkeley
 
 # Don't discard emails with identical message-id header (enabled by default):
 duplicatesuppression: 0