diff --git a/doc/rpm-build/egroupware-epl.spec b/doc/rpm-build/egroupware-epl.spec
index 8fdeecfb6e..38a976d274 100644
--- a/doc/rpm-build/egroupware-epl.spec
+++ b/doc/rpm-build/egroupware-epl.spec
@@ -20,13 +20,13 @@ Prefix: /usr/share
 	%define php php5
 	%define extra_requires apache2 apache2-mod_php5 php_any_db php5-dom
 	%define cron cron
-	%define rpm_post_install /usr/bin/php5 %{egwdir}/doc/rpm-build/rpm_post_install.php --php /usr/bin/php5 --start_db /etc/init.d/mysql --autostart_db /sbin/chkconfig --level 3 mysql on --start_webserver /etc/init.d/apache2 --autostart_webserver /sbin/chkconfig --level 3 apache2 on
+	%define rpm_post_install /usr/bin/php5 %{egwdir}/doc/rpm-build/rpm_post_install.php --source_dir %{egwdir} --php /usr/bin/php5 --start_db /etc/init.d/mysql --autostart_db /sbin/chkconfig --level 3 mysql on --start_webserver /etc/init.d/apache2 --autostart_webserver /sbin/chkconfig --level 3 apache2 on
 %else
 	%define php php
 	%define httpdconfd /etc/httpd/conf.d
 	%define source5 egroupware_fedora.tar.bz2
 	%define cron crontabs
-	%define rpm_post_install /usr/bin/php %{egwdir}/doc/rpm-build/rpm_post_install.php
+	%define rpm_post_install /usr/bin/php %{egwdir}/doc/rpm-build/rpm_post_install.php --source_dir %{egwdir}
 %endif
 %if 0%{?fedora_version}
 	%define osversion %{?fedora_version}
diff --git a/doc/rpm-build/rpm_post_install.php b/doc/rpm-build/rpm_post_install.php
index 7ebc31dc74..df9e482432 100644
--- a/doc/rpm-build/rpm_post_install.php
+++ b/doc/rpm-build/rpm_post_install.php
@@ -18,8 +18,8 @@ $config = array(
 	'php'         => '/usr/bin/php',
 	'source_dir'  => '/usr/share/egroupware',
 	'data_dir'    => '/var/lib/egroupware',
-	'header'      => '/var/lib/egroupware/header.inc.php',	// symlinked to source_dir by rpm
-	'setup-cli'   => '/usr/share/egroupware/setup/setup-cli.php',
+	'header'      => '$data_dir/header.inc.php',	// symlinked to source_dir by rpm
+	'setup-cli'   => '$source_dir/setup/setup-cli.php',
 	'domain'      => 'default',
 	'config_user' => 'admin',
 	'config_passwd'   => randomstring(),
@@ -42,8 +42,9 @@ $config = array(
 	'start_webserver' => '/etc/init.d/httpd',
 	'autostart_webserver' => '/sbin/chkconfig --level 3 httpd on',
 );
+
 // read language from LANG enviroment variable
-if (($lang = $_ENV['LANG']))
+if (($lang = isset($_ENV['LANG']) ? $_ENV['LANG'] : $_SERVER['LANG']))
 {
 	list($lang,$nat) = split('[_.]',$lang);
 	if (in_array($lang.'-'.strtolower($nat),array('es-es','pt-br','zh-tw')))
@@ -75,6 +76,16 @@ while(($arg = array_shift($argv)))
 		usage("Unknown argument '$arg'!");
 	}
 }
+
+$replace = array();
+foreach($config as $name => $value)
+{
+	$replace['$'.$name] = $value;
+	if (strpos($value,'$') !== false)
+	{
+		$config[$name] = strtr($value,$replace);
+	}
+}
 // basic config checks
 foreach(array('php','source_dir','data_dir','setup-cli') as $name)
 {