diff --git a/src/libexec/zmfixperms b/src/libexec/zmfixperms
index 0669c4084..58b78fad4 100755
--- a/src/libexec/zmfixperms
+++ b/src/libexec/zmfixperms
@@ -293,34 +293,11 @@ if [ -d /opt/zimbra ]; then
       chmod 640 /opt/zimbra/conf/sasl2/smtpd.conf
       chown ${zimbra_user}:${zimbra_group} /opt/zimbra/conf/sasl2/smtpd.conf
     fi
-    
+
     if [ -d /opt/zimbra/conf/templates/ ]; then
-      chmod 755 /opt/zimbra/conf/templates
-      chown ${zimbra_user}:${zimbra_group} /opt/zimbra/conf/templates
-      
-      chmod 755 \
-        /opt/zimbra/conf/templates /opt/zimbra/conf/templates/abook /opt/zimbra/conf/templates/briefcase \
-        /opt/zimbra/conf/templates/calendar /opt/zimbra/conf/templates/data /opt/zimbra/conf/templates/dwt \
-        /opt/zimbra/conf/templates/mail /opt/zimbra/conf/templates/prefs /opt/zimbra/conf/templates/share \
-        /opt/zimbra/conf/templates/tasks /opt/zimbra/conf/templates/voicemail /opt/zimbra/conf/templates/zimbra
-
-      chown ${zimbra_user}:${zimbra_group} \
-        /opt/zimbra/conf/templates /opt/zimbra/conf/templates/abook /opt/zimbra/conf/templates/briefcase \
-        /opt/zimbra/conf/templates/calendar /opt/zimbra/conf/templates/data /opt/zimbra/conf/templates/dwt \
-        /opt/zimbra/conf/templates/mail /opt/zimbra/conf/templates/prefs /opt/zimbra/conf/templates/share \
-        /opt/zimbra/conf/templates/tasks /opt/zimbra/conf/templates/voicemail /opt/zimbra/conf/templates/zimbra
-
-      chmod 644 \
-        /opt/zimbra/conf/templates/abook/* /opt/zimbra/conf/templates/admin/* /opt/zimbra/conf/templates/briefcase/* \
-        /opt/zimbra/conf/templates/calendar/* /opt/zimbra/conf/templates/data/* /opt/zimbra/conf/templates/dwt/* \
-        /opt/zimbra/conf/templates/mail/* /opt/zimbra/conf/templates/prefs/* /opt/zimbra/conf/templates/share/* \
-        /opt/zimbra/conf/templates/tasks/* /opt/zimbra/conf/templates/voicemail/* /opt/zimbra/conf/templates/zimbra/*
-        
-      chown ${zimbra_user}:${zimbra_group} \
-        /opt/zimbra/conf/templates/abook/* /opt/zimbra/conf/templates/admin/* /opt/zimbra/conf/templates/briefcase/* \
-        /opt/zimbra/conf/templates/calendar/* /opt/zimbra/conf/templates/data/* /opt/zimbra/conf/templates/dwt/* \
-        /opt/zimbra/conf/templates/mail/* /opt/zimbra/conf/templates/prefs/* /opt/zimbra/conf/templates/share/* \
-        /opt/zimbra/conf/templates/tasks/* /opt/zimbra/conf/templates/voicemail/* /opt/zimbra/conf/templates/zimbra/*
+      chown -R ${zimbra_user}:${zimbra_group} /opt/zimbra/conf/templates
+      find /opt/zimbra/conf/templates/ -type d -exec chmod 755 {} \;
+      find /opt/zimbra/conf/templates/ -type f -exec chmod 644 {} \;
     fi
   fi