diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec
index fac6743116..91e2ad12aa 100644
--- a/doc/rpm-build/egroupware-epl.spec
+++ b/doc/rpm-build/egroupware-epl.spec
@@ -1,5 +1,5 @@
 Name: egroupware-epl
-Version: 9.2.20100322
+Version: 9.2.20100504
 Release:
 Summary: EGroupware is a web-based groupware suite written in php.
 Group: Web/Database
@@ -67,6 +67,7 @@ Source6: debian.changes
 Source7: %{name}-rpmlintrc
 Patch0: class.uiasyncservice.inc.php.patch
 Patch1: stylite-postfix-suse.patch
+#Patch2: mandriva_upload_tmp_dir.patch
 BuildRoot: %{_tmppath}/%{name}-9.2-buildroot
 
 #otherwise build fails because of jar files in G2
@@ -506,6 +507,7 @@ for Thomson-Reuters.
 %setup5 -T -D -a 5 -n %{egwdirname}
 %patch0 -p 0
 %patch1 -p 0
+#%patch2 -p 0
 
 %build
 
@@ -572,7 +574,7 @@ install -m 444 %{SOURCE6} $RPM_BUILD_ROOT%{egwdir}/doc/rpm-build
 %{egwdir}/preferences
 %{egwdir}/setup
 %attr(0644,root,root) /etc/cron.d/egroupware
-%config %attr(0644,root,root) %{httpdconfd}/egroupware.conf
+%config(noreplace) %attr(0644,root,root) %{httpdconfd}/egroupware.conf
 %if 0%{?suse_version}
 	%dir %attr(0755,root,root) /etc/apache2
 	%dir %attr(0755,root,root) %{httpdconfd}
@@ -583,7 +585,7 @@ install -m 444 %{SOURCE6} $RPM_BUILD_ROOT%{egwdir}/doc/rpm-build
 %dir %attr(0700,%{apache_user},%{apache_group}) %{egwdatadir}/default
 %dir %attr(0700,%{apache_user},%{apache_group}) %{egwdatadir}/default/files
 %dir %attr(0700,%{apache_user},%{apache_group}) %{egwdatadir}/default/backup
-%config %attr(0640,%{apache_user},%{apache_group}) %{egwdatadir}/header.inc.php
+%config(noreplace) %attr(0640,%{apache_user},%{apache_group}) %{egwdatadir}/header.inc.php
 
 # addressbook is part of core now, as it contains required classes for accounts
 #%files addressbook