diff --git a/htdocs/includes/modules/DolibarrModules.class.php b/htdocs/includes/modules/DolibarrModules.class.php
index a3fb2bf2c40..0ace8db325d 100644
--- a/htdocs/includes/modules/DolibarrModules.class.php
+++ b/htdocs/includes/modules/DolibarrModules.class.php
@@ -1066,7 +1066,7 @@ class DolibarrModules
 				}
 
 				// Define directory full path
-				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $fulldir = DOL_DATA_ROOT.$dir;
+				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) $fulldir = DOL_DATA_ROOT.$dir;
 				else $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
 				// Create dir if it does not exists
 				if ($fulldir && ! file_exists($fulldir))
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index b3a6ed08b4e..98a16d45661 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2009 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2008 Regis Houssin         <regis@dolibarr.fr>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by