--- roundcubemail-0.6.old/installer/index.php	2011-09-05 10:49:04.000000000 +0200
+++ roundcubemail-0.6/installer/index.php	2011-09-30 16:22:07.248970217 +0200
@@ -32,7 +32,8 @@
 ini_set('display_errors', 1);
 
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+
 
 $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
 $include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
--- roundcubemail-0.6.old/program/include/iniset.php	2011-09-28 21:16:41.000000000 +0200
+++ roundcubemail-0.6/program/include/iniset.php	2011-09-30 16:25:26.292976385 +0200
@@ -41,15 +41,13 @@
 define('RCMAIL_CHARSET', 'UTF-8');
 define('JS_OBJECT_NAME', 'rcmail');
 define('RCMAIL_START', microtime(true));
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
+
 
 if (!defined('INSTALL_PATH')) {
     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 }
 
-if (!defined('RCMAIL_CONFIG_DIR')) {
-    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-}
-
 // make sure path_separator is defined
 if (!defined('PATH_SEPARATOR')) {
     define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');