diff --git a/share/templates/cyrus.conf.tpl b/share/templates/cyrus.conf.tpl
index 1d9b4c7..8c781e7 100644
--- a/share/templates/cyrus.conf.tpl
+++ b/share/templates/cyrus.conf.tpl
@@ -1,43 +1,43 @@
 # standard standalone server implementation
 
 START {
     # do not delete this entry!
     recover	    cmd="ctl_cyrusdb -r"
 
     idled       cmd="idled"
 }
 
 # UNIX sockets start with a slash and are put into /var/lib/imap/sockets
 SERVICES {
     imaps       cmd="imapd -s"  listen="127.0.0.1:9993"                 prefork=5
 
     sieve       cmd="timsieved" listen="sieve"                          prefork=0
 
     ptloader    cmd="ptloader"  listen="/var/lib/imap/socket/ptsock"    prefork=0
 
     lmtpunix    cmd="lmtpd"     listen="/var/lib/imap/socket/lmtp"      prefork=1
 
     notify      cmd="notifyd"   listen="/var/lib/imap/socket/notify"    proto="udp" prefork=1
 }
 
 EVENTS {
     # this is required
     checkpoint	cmd="ctl_cyrusdb -c" period=30
 
     # this is only necessary if using duplicate delivery suppression,
     # Sieve or NNTP
     duplicateprune cmd="cyr_expire -E 3" at=0400
 
     # Expire data older then 69 days. Two full months of 31 days
     # each includes two full backup cycles, plus 1 week margin
     # because we run our full backups on the first sat/sun night
     # of each month.
     deleteprune cmd="cyr_expire -E 4 -D 69" at=0430
     expungeprune cmd="cyr_expire -E 4 -X 69" at=0445
 
     # this is only necessary if caching TLS sessions
     tlsprune	cmd="tls_prune" at=0400
 
-    # Create search indexes regularly
+    # Create search indexes regularly (remove -s for cyrus 3+)
     #squatter    cmd="squatter -s -i" at=0530
 }
diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl
index 0703a22..aaaf3c2 100644
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -1,50 +1,52 @@
 configdirectory: $configdirectory
 partition-default: $partition_default
 admins: $admins
 sievedir: $sievedir
 sendmail: /usr/sbin/sendmail
 sasl_pwcheck_method: saslauthd
 sasl_mech_list: PLAIN LOGIN
 allowplaintext: no
 tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem
 tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem
 # uncomment this if you're operating in a DSCP environment (RFC-4594)
 # qosmarking: af13
 auth_mech: pts
 pts_module: ldap
 ptloader_sock: /var/lib/imap/socket/ptsock
 ldap_servers: $ldap_servers
 ldap_sasl: 0
 ldap_base: $ldap_base
 ldap_bind_dn: $ldap_bind_dn
 ldap_password: $ldap_password
 ldap_filter: $ldap_filter
 ldap_user_attribute: $ldap_user_attribute
 ldap_group_base: $ldap_group_base
 ldap_group_filter: $ldap_group_filter
 ldap_group_scope: $ldap_group_scope
 ldap_member_base: $ldap_member_base
 ldap_member_method: $ldap_member_method
 ldap_member_attribute: $ldap_member_attribute
 ldap_restart: 1
 ldap_timeout: 10
 ldap_time_limit: 10
 unixhierarchysep: 1
 virtdomains: userid
 annotation_definitions: /etc/imapd.annotations.conf
 sieve_extensions: fileinto reject envelope body vacation imapflags notify include regex subaddress relational copy date index
 allowallsubscribe: 0
 allowusermoves: 1
 altnamespace: 1
 hashimapspool: 1
 anysievefolder: 1
 fulldirhash: 0
 sieveusehomedir: 0
 sieve_allowreferrals: 0
 lmtp_downcase_rcpt: 1
 lmtp_fuzzy_mailbox_match: 1
 username_tolower: 1
 deletedprefix: DELETED
 delete_mode: delayed
 expunge_mode: delayed
 postuser: shared
+# on systems with cyrus 3+ specify search engine
+# search_engine: squat