diff --git a/ChangeLog b/ChangeLog
index c1cfa3c714c..6b33f272ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,8 +83,8 @@ For developers:
 - Updated wiki documentation.
 - Better W3C standard.
 - Can add init data when enabling a module.
-- Can fix some corruptions in database by calling the update page with
-  action=repair
+- Can fix some corruptions in database by calling the update page 
+  /install/repair.ksh
 - Log files contains more information (PHP_SELD added and OS user used for 
   log of command lines scripts) 
 - Can protect a module to not being enabled if javascript disabled.
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 7ff8b81c85c..2bd65234b37 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -294,7 +294,7 @@ if ($_POST["action"] == "set")
 
 		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
 
-		print '<center><a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+		print '<center><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
 		print $langs->trans("GoToSetupArea");
 		print '</a></center>';
 	}
@@ -332,7 +332,7 @@ elseif (eregi('upgrade',$_POST["action"]))
 
 		print "<br>";
 
-		print '<center><a href="'.$dolibarr_main_url_root .'/index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+		print '<center><a href="../index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
 		print $langs->trans("GoToDolibarr");
 		print '</a></center>';
 	}
@@ -344,7 +344,7 @@ elseif (eregi('upgrade',$_POST["action"]))
 
 		print "<br>";
 
-		print '<center><a href="'.$dolibarr_main_url_root .'/install/index.php">';
+		print '<center><a href="../install/index.php">';
 		print $langs->trans("GoToUpgradePage");
 		print '</a></center>';
 	}
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index f527bb1cc02..cd4b2f1286d 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -56,8 +56,8 @@ if ($dolibarr_main_db_type == "pgsql") $choix=2;
 if ($dolibarr_main_db_type == "mssql") $choix=3;
 
 
-dolibarr_install_syslog("upgrade: Entering upgrade.php page");
-if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initialized",LOG_ERR);
+dolibarr_install_syslog("repair: Entering upgrade.php page");
+if (! is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized",LOG_ERR);
 
 
 /*
@@ -102,13 +102,13 @@ if ($db->connected == 1)
 {
 	print '<tr><td nowrap="nowrap">';
 	print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
-	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
+	dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK"));
 	$ok = 1;
 }
 else
 {
 	print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>";
-	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+	dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
 	$ok = 0;
 }
 
@@ -118,13 +118,13 @@ if ($ok)
 	{
 		print '<tr><td nowrap="nowrap">';
 		print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>";
-		dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name");
+		dolibarr_install_syslog("repair: Database connection successfull : $dolibarr_main_db_name");
 		$ok=1;
 	}
 	else
 	{
 		print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>";
-		dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
+		dolibarr_install_syslog("repair: ".$langs->transnoentities("ErrorFailedToConnectToDatabase",$dolibarr_main_db_name));
 		$ok=0;
 	}
 }
@@ -136,7 +136,7 @@ if ($ok)
 	$versionarray=$db->getVersionArray();
 	print '<tr><td>'.$langs->trans("ServerVersion").'</td>';
 	print '<td align="right">'.$version.'</td></tr>';
-	dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerVersion")." : $version");
+	dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerVersion")." : $version");
 	//print '<td align="right">'.join('.',$versionarray).'</td></tr>';
 }
 
@@ -201,6 +201,11 @@ if (empty($actiondone))
     print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
 }
 
+
+print '<center><a href="../index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+print $langs->trans("GoToDolibarr");
+print '</a></center>';
+
 pFooter(1,$setuplang);
 
 ?>
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index b81d5780138..d65bb0cda0c 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -80,7 +80,11 @@ if (empty($dolibarr_main_data_root))
 // Define some constants
 define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);		// Filesystem pages php (htdocs)
 define('DOL_DATA_ROOT', $dolibarr_main_data_root);				// Filesystem donnes (documents)
-if ($dolibarr_main_url_root == 'auto') $dolibarr_main_url_root=$_SERVER["SERVER_NAME"];	// This make possible to reach web site with different URLs (works only if dolibarr dir is virtual web root dir).
+if ($dolibarr_main_url_root == 'auto')
+{
+	// TODO Try to define dolibarr_main_url_root with non root installation
+	$dolibarr_main_url_root=$_SERVER["SERVER_NAME"];	// This make possible to reach web site with different URLs (works only if dolibarr dir is virtual web root dir).
+}
 define('DOL_MAIN_URL_ROOT', $dolibarr_main_url_root);			// URL relative root
 $uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root);	// $suburi contains url without http*
 $suburi = strstr ($uri, '/');		// $suburi contains url without domain