--- /usr/sbin/cyrus-makedirs.orig	2008-04-18 15:36:14.000000000 +0200
+++ /usr/sbin/cyrus-makedirs	2008-06-10 20:54:20.000000000 +0200
@@ -89,7 +89,7 @@
     	[ -d "$confdir/$i/$j" ] || mkdir "$confdir/$i/$j"
     done
 done
-find "$confdir" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+find "$confdir" \( -not -user cyrus -or -not -group mail \) -exec chown cyrus:mail {} \;
 
 # Now, create the spool partitions
 for i in $partitions ; do
@@ -102,7 +102,7 @@
 	   done
 	}
 	[ -d "$i/stage." ] || mkdir "$i/stage."
-	find "$i" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+	find "$i" \( -not -user cyrus -or -not -group mail \) -exec chown cyrus:mail {} \;
 	# and kill any squatter indexes
 	[ $killsquat -ne 0 ] && find "$i" -name 'cyrus.squat' -type f -exec rm -f "{}" \;
 done
@@ -115,7 +115,7 @@
 		[ -d "$sievedir/$j" ] || mkdir "$sievedir/$j"
 		chmod 755 "$sievedir/$j"
 	done
-	find "$sievedir" -not -user cyrus -or -not -group mail -exec chown cyrus:mail {} \;
+	find "$sievedir" \( -not -user cyrus -or -not -group mail \) -exec chown cyrus:mail {} \;
 }
 
 [ "x${CYRUSOPTFILESYS}" != "x1" ] && exit 0