diff --git a/doc/rpm-build/egroupware-1.6.spec b/doc/rpm-build/egroupware-1.6.spec
index b2843e2a87..f91b694774 100644
--- a/doc/rpm-build/egroupware-1.6.spec
+++ b/doc/rpm-build/egroupware-1.6.spec
@@ -1,15 +1,15 @@
 %define packagename eGroupware
 %define egwdirname egroupware
 %define egwversion 1.6
-%define packaging rc5
-#%define epoch 1
+%define packaging 001
+#define epoch 1
 %if 0%{?suse_version}
 	%define httpdroot /srv/www/htdocs
 	%define httpdconfd /etc/apache2/conf.d
 	%define source5 egroupware_suse.tar.bz2
 	%define distribution SUSE Linux %{?suse_version}
 	%define php php5
-	%define extra_requires apache2-mod_php5 php_any_db php5-dom
+	%define extra_requires apache2 apache2-mod_php5 php_any_db php5-dom
 	%define cron cron
 %endif
 %if 0%{?fedora_version}
@@ -29,7 +29,7 @@
 	%define source5 egroupware_fedora.tar.bz2
 	%define distribution Mandriva %{?mandriva_version}
 	%define php php
-	%define extra_requires apache2 php-mysql php-dom
+	%define extra_requires apache php-mysql php-dom
 	%define cron crontabs
 %endif
 %if 0%{?rhel_version}
@@ -37,7 +37,7 @@
 	%define httpdconfd /etc/httpd/conf.d
 	%define osversion %{?rhel_version}
 	%define source5 egroupware_fedora.tar.bz2
-	%define distribution Red Head %{?rhel_version}
+	%define distribution Red Hat %{?rhel_version}
 	%define php php
 	%define extra_requires httpd php-mysql php-xml
 	%define cron crontabs
@@ -99,12 +99,15 @@ Source2: %{packagename}-icalsrv-%{egwversion}.%{packaging}.tar.bz2
 Source3: %{packagename}-mydms-%{egwversion}.%{packaging}.tar.bz2
 Source4: %{packagename}-gallery-%{egwversion}.%{packaging}.tar.bz2
 Source5: %{?source5}
+Source6: %{name}-%{version}-rpmlintrc
 Patch0: class.uiasyncservice.inc.php.patch
 BuildRoot: /tmp/%{packagename}-buildroot
 Requires: %{php} %{php}-mbstring %{php}-imap %{php}-gd %{php}-pear %{extra_requires} %{cron} %{packagename}-egw-pear = %{egwversion}.%{packaging}
 Provides: egw-core egw-%{addressbook} egw-%{etemplate}
 Conflicts: %{packagename}-core %{packagename}-%{addressbook} %{packagename}-%{bookmarks} %{packagename}-%{calendar} %{packagename}-%{developer_tools} %{packagename}-%{emailadmin} %{packagename}-%{felamimail} %{packagename}-%{filemanager} %{packagename}-%{infolog} %{packagename}-%{importexport} %{packagename}-%{manual} %{packagename}-%{news_admin} %{packagename}-%{notifications} %{packagename}-%{phpbrain} %{packagename}-%{polls} %{packagename}-%{projectmanager} %{packagename}-%{registration} %{packagename}-%{resources} %{packagename}-%{sambaadmin} %{packagename}-%{sitemgr} %{packagename}-%{syncml} %{packagename}-%{timesheet} %{packagename}-%{wiki}
 Obsoletes: %{packagename}-%{icalsrv}
+#otherwise build fails because of jar files in G2
+BuildRequires: unzip
 
 Prefix: /usr/share
 Buildarch: noarch
@@ -473,6 +476,7 @@ rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/xmlrpc
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/messenger
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/workflow
 rm -rf $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/jinn
+rm -f $RPM_BUILD_ROOT%{prefix}/%{egwdirname}/admin/inc/*.orig
 
 find $RPM_BUILD_ROOT%{prefix}/%{egwdirname} -name .svn | xargs rm -rf
 
@@ -548,6 +552,8 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 %attr(0644,root,root) /etc/cron.d/egroupware
 %config %attr(0644,root,root) %{httpdconfd}/egroupware.conf
 %if 0%{?suse_version}
+	%dir %attr(0755,root,root) /etc/apache2
+	%dir %attr(0755,root,root) %{httpdconfd}
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/files
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/backup
@@ -598,6 +604,8 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 %attr(0644,root,root) /etc/cron.d/egroupware
 %config %attr(0644,root,root) %{httpdconfd}/egroupware.conf
 %if 0%{?suse_version}
+	%dir %attr(0755,root,root) /etc/apache2
+	%dir %attr(0755,root,root) %{httpdconfd}
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/files
 	%dir %attr(0755,wwwrun,www) /var/lib/egroupware/default/backup
@@ -730,6 +738,9 @@ ln -s ../../../var/lib/egroupware/header.inc.php
 
 
 %changelog
+* Mon Nov 24 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.6.001
+- eGroupware 1.6.001 final 1.6 release
+
 * Sun Nov 16 2008 Ralf Becker <RalfBecker@outdoor-training.de> 1.6.rc5
 - eGroupware 1.6.rc5 5. release candidate for 1.6 release