diff --git a/share/templates/cyrus.conf.tpl b/share/templates/cyrus.conf.tpl
--- a/share/templates/cyrus.conf.tpl
+++ b/share/templates/cyrus.conf.tpl
@@ -38,6 +38,6 @@
     # 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
--- a/share/templates/imapd.conf.tpl
+++ b/share/templates/imapd.conf.tpl
@@ -48,3 +48,5 @@
 delete_mode: delayed
 expunge_mode: delayed
 postuser: shared
+# on systems with cyrus 3+ specify search engine
+# search_engine: squat