diff --git a/postfix.spec b/postfix.spec
index 8d76e84..d7aef03 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -232,6 +232,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_libdir}/sasl2
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
 mkdir -p $RPM_BUILD_ROOT/%{conf_backup_dir}
 mkdir -p $RPM_BUILD_ROOT/%{pf_sample_directory}
+mkdir -p $RPM_BUILD_ROOT/%{pf_html_directory}
 mkdir -p $RPM_BUILD_ROOT/usr/include/%{name}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 install -m 644 %{name}-SuSE/smtp $RPM_BUILD_ROOT/etc/pam.d/smtp
@@ -256,7 +257,6 @@ sed -e 's;@lib@;%{_lib};g' \
     -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}
-install -m 644 %{name}-SuSE/master.cf $RPM_BUILD_ROOT/etc/%{name}/master.cf
 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
@@ -270,7 +270,6 @@ 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}
-install -m 644 %{name}-SuSE/master.cf $RPM_BUILD_ROOT/%{conf_backup_dir}/master.cf
 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/
@@ -313,17 +312,10 @@ install -m 644 include/*.h $RPM_BUILD_ROOT/usr/include/%{name}/
 for example in AIX42 BSDI* F* HPUX* IRIX* NETBSD1 NEXTSTEP3 OPENSTEP4 OSF1 Solaris*; do
   %{__rm} examples/chroot-setup/${example}
 done
-# files-duplicate /usr/share/doc/packages/postfix-doc/html/
-# so we copy all docs to a postfix-doc to do fdupes :)
-%{__install} -d $RPM_BUILD_ROOT%{pf_docdir}/html
-for doc in AAAREADME COMPATIBILITY COPYRIGHT HISTORY INSTALL IPv6-ChangeLog LICENSE PORTING RELEASE_NOTES* US_PATENT_6321267 TLS_LICENSE README_FILES auxiliary examples html %{name}-SuSE/README.SuSE %{name}-SuSE/SPAMASSASSIN+POSTFIX.SuSE; do
-  %{__cp} -rv ${doc} $RPM_BUILD_ROOT%{pf_docdir}/
-done
-%if 0%{?suse_version} >= 1100
+cp -a examples/* $RPM_BUILD_ROOT%{pf_sample_directory}
+cp -a html/*     $RPM_BUILD_ROOT%{pf_html_directory}
 %fdupes $RPM_BUILD_ROOT%{pf_docdir}
-# files-duplicate /usr/share/man/man?
 %fdupes $RPM_BUILD_ROOT%{_mandir}
-%endif
 # ---------------------------------------------------------------------------
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/usr/sbin/
 
@@ -338,7 +330,7 @@ if [ -z "$VERSIONTEST" -a -f %{pf_queue_directory}/pid/master.pid ]; then
 fi
 /usr/sbin/groupadd -g %{pf_gid} -o -r %{name} 2> /dev/null || :
 /usr/sbin/groupadd -g %{maildrop_gid} -o -r maildrop 2> /dev/null || :
-/usr/sbin/useradd -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || :
+/usr/sbin/useradd  -r -o -g %{name} -u %{pf_uid} -s /bin/false -c "Postfix Daemon" -d /%{pf_queue_directory} %{name} 2> /dev/null || :
 # ---------------------------------------------------------------------------
 
 %pre mysql