diff --git a/postfix-SuSE.tar.gz b/postfix-SuSE.tar.gz
index 3cede7d..f95bd15 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:4f51c3128346fba59d1c6787b0a918f85a7746ecdec90eccc57d6683ba40e009
-size 31764
+oid sha256:c3b1f635a74e32d766f35896a10b08b489c735a4b33dcfff76ac348137555cac
+size 24347
diff --git a/postfix.changes b/postfix.changes
index 99e8395..36e1dd5 100644
--- a/postfix.changes
+++ b/postfix.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 18 09:32:04 UTC 2011 - varkoly@novell.com
+
+- Move SuSEconfig.postfix into /usr/sbin/
+  (FATE#311272: Do not rewrite postfix.cf via SuSEconfig)
+  SuSEconfig.postfix will be executed only once after installation
+  automaticaly. Afterwards only you can start it manually or via
+  yast2 mail module.
+ 
 -------------------------------------------------------------------
 Fri Aug 12 16:40:40 UTC 2011 - werner@suse.de
 
diff --git a/postfix.spec b/postfix.spec
index e60c0b5..25ccf41 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -225,7 +225,7 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 rm -f $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
 sed -e 's;@lib@;%{_lib};g' %{name}-SuSE/sysconfig.%{name} > $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.%{name}
 install -m 644 %{name}-SuSE/sysconfig.mail-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mail-%{name}
-rm -f $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
+test -e $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name} && rm -f $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
 sed -e 's;@lib@;%{_lib};g' \
     -e 's;@conf_backup_dir@;%{conf_backup_dir};' \
     -e 's;@daemon_directory@;%{pf_daemon_directory};' \
@@ -237,8 +237,8 @@ sed -e 's;@lib@;%{_lib};g' \
     -e 's;@newaliases_path@;%{pf_newaliases_path};' \
     -e 's;@sample_directory@;%{pf_sample_directory};' \
     -e 's;@mailq_path@;%{pf_mailq_path};' %{name}-SuSE/SuSEconfig.%{name} \
-                 > $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
-chmod 755 $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.%{name}
+                 > $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
+chmod 755 $RPM_BUILD_ROOT/usr/sbin/SuSEconfig.%{name}
 install -m 644 %{name}-SuSE/dynamicmaps.cf $RPM_BUILD_ROOT/etc/%{name}/dynamicmaps.cf
 install -m 644 %{name}-SuSE/ldap_aliases.cf $RPM_BUILD_ROOT/etc/%{name}/ldap_aliases.cf
 install -m 644 %{name}-SuSE/helo_access $RPM_BUILD_ROOT/etc/postfix/helo_access
@@ -386,6 +386,11 @@ fi
 /usr/sbin/postfix set-permissions
 if [ ${1:-0} -gt 1 ]; then
 	/usr/sbin/postfix upgrade-configuration || :
+else
+        if [ ! -e /sbin/conf.d/SuSEconfig.postfix ]
+        then
+                ln -s /usr/sbin/SuSEconfig.postfix /sbin/conf.d/SuSEconfig.postfix
+        fi
 fi
 # before fillup we need to fix something
 %{__sed} -i \
@@ -427,7 +432,7 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/pam.d/*
 /var/adm/fillup-templates/sysconfig.%{name}
 /var/adm/fillup-templates/sysconfig.mail-%{name}
-/sbin/conf.d/SuSEconfig.%{name}
+/usr/sbin/SuSEconfig.%{name}
 %config(noreplace) %{omc_dir}/%{name}.xml
 %dir /etc/%{name}
 %config /etc/%{name}/main.cf.default