diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index 6df0457..ae7e832 100644
--- a/postfix-SuSE.tar.gz
+++ b/postfix-SuSE.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce162d907a42604876eb3b7a64efdd368bdcc7e731a3d38026fda11207f9c388
-size 22188
+oid sha256:a77a188e75c5c2f6fe92b73eca4c26e0ff2636220ca2283fbd4721d4c52a2c17
+size 22494
diff --git a/postfix.spec b/postfix.spec
index d7aef03..2504549 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -269,11 +269,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/sasl2
 install -m 600 %{name}-SuSE/smtpd.conf $RPM_BUILD_ROOT/etc/sasl2/smtpd.conf
 install -m 644 %{name}-SuSE/openssl_%{name}.conf.in $RPM_BUILD_ROOT/etc/%{name}/openssl_%{name}.conf.in
 install -m 755 %{name}-SuSE/mk%{name}cert $RPM_BUILD_ROOT/usr/sbin/mk%{name}cert
-rm -rf $RPM_BUILD_ROOT/%{pf_queue_directory}
 mkdir   -p $RPM_BUILD_ROOT/%{omc_dir}
 install -m 644 %{name}-SuSE/%{name}.xml $RPM_BUILD_ROOT/%{omc_dir}
 mkdir -p  $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/
-install -m 644 %{name}-SuSE/%{name}-fw $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name}
+install -m 644 %{name}-SuSE/%{name}-fw    $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name}
 {
 cat<<EOF
 #
@@ -299,10 +298,11 @@ $RPM_BUILD_ROOT/usr/sbin/postconf -c $RPM_BUILD_ROOT/etc/%{name} \
 	   "daemon_directory  = %{pf_daemon_directory}" \
            "biff              = no" \
            "inet_protocols    = all"
-install -m 644 $RPM_BUILD_ROOT/etc/%{name}/main.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/main.cf
+#Set Permissions
+install -m 644 %{name}-SuSE/%{name}-files $RPM_BUILD_ROOT/usr/lib/postfix/postfix-files
 # postfix-mysql
 install -m 644 %{name}-mysql/main.cf-mysql $RPM_BUILD_ROOT/etc/%{name}/main.cf-mysql
-install -m 640 %{name}-mysql/*_maps.cf $RPM_BUILD_ROOT/etc/%{name}/
+install -m 640 %{name}-mysql/*_maps.cf     $RPM_BUILD_ROOT/etc/%{name}/
 # create paranoid permissions file
 printf '%%-38s %%-18s %%s\n' /usr/sbin/postdrop "root.%{pf_setgid_group}" "0755" >> $RPM_BUILD_ROOT/etc/permissions.d/%{name}.paranoid
 printf '%%-38s %%-18s %%s\n' /usr/sbin/postqueue "root.%{pf_setgid_group}" "0755" >> $RPM_BUILD_ROOT/etc/permissions.d/%{name}.paranoid
@@ -392,6 +392,7 @@ fi
 %post
 # We never have to run suseconfig for postfix after installation
 # We only start postfix own upgrade-configuration by update
+/usr/sbin/postfix set-permissions
 if [ ${1:-0} -gt 1 ]; then
 	/usr/sbin/postfix upgrade-configuration || :
 fi
@@ -472,7 +473,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/sbin/smtp-source
 /usr/sbin/mk%{name}cert
 /usr/sbin/check_mail_queue
-/usr/sbin/post*
+%verify(not mode group) /usr/sbin/post*
 /sbin/rc%{name}
 %{_libdir}/lib*
 /usr/lib/sendmail
@@ -484,6 +485,20 @@ rm -rf $RPM_BUILD_ROOT
 %{conf_backup_dir}
 %dir %attr(0700,%{name},root) %{pf_data_directory}
 %{_mandir}/man?/*.gz
+%dir %attr(0755,%{name},root) /%{pf_queue_directory}
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/active
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/bounce
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/corrupt
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/defer
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/deferred
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/flush
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/hold
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/incoming
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/private
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/saved
+%dir %attr(0700,%{name},root) /%{pf_queue_directory}/trace
+%dir %attr(0730,%{name},maildrop) /%{pf_queue_directory}/maildrop
+%dir %attr(0710,%{name},maildrop) /%{pf_queue_directory}/public
 
 %files devel
 %defattr(-,root,root)