diff --git a/setup/config.php b/setup/config.php
index 3c1fb0dcf3..fb0ec3d8ba 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -65,6 +65,11 @@
   while (@$db->next_record()) {
     $current_config[$db->f("config_name")] = $db->f("config_value");
   }
+
+  if ($current_config["files_dir"] == "/path/to/dir/phpgroupware/files") {
+     $current_config["files_dir"] = $phpgw_info["server"]["server_root"] . "/files";
+  }
+
   
   if ($error == "badldapconnection") {
      // Please check the number and dial again :)
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index fc4b7c801d..8f1affb27e 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -806,5 +806,5 @@
   v0_9_6to0_9_7();
   v0_9_7to0_9_8();
   v0_9_8to0_9_9();
-  v0_9_9to0_9_10();
+  //v0_9_9to0_9_10();
 ?>