diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index d6135379df6..a3ec95b4cff 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -84,8 +84,7 @@ $i = 0;	// is a sequencer of modules found
 $j = 0;	// j is module number. Automatically affected if module number not defined.
 foreach ($conf->file->dol_document_root as $dirroot)
 {
-	if (preg_match('/custom$/i',$dirroot)) $dir = $dirroot . "/modules/";
-	else $dir = $dirroot . "/includes/modules/";
+	$dir = $dirroot . "/includes/modules/";
 
 	// Load modules attributes in arrays (name, numero, orders) from dir directory
 	//print $dir."\n<br>";
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 985e30ca415..0146eb23aa8 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -52,8 +52,7 @@ $modules_files = array();
 // Load list of modules
 foreach($conf->file->dol_document_root as $searchdir)
 {
-	if (preg_match('/custom$/i',$searchdir)) $dirtoscan = $searchdir . "/modules/";
-	else $dirtoscan = $searchdir . "/includes/modules/";
+	$dirtoscan = $searchdir . "/includes/modules/";
 	$handle=opendir($dirtoscan);
     if (is_resource($handle))
     {
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index afa35333a72..48580c88e24 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -183,7 +183,6 @@ class Translate {
 			// in htdocs/custom/modules/mymodule/langs/code_CODE/file.lang
 			// and in htdocs/mymodule/langs/code_CODE/file.lang for backward compatibility
 			// instead of file htdocs/langs/code_CODE/filelang
-			if (preg_match('/custom$/i',$searchdir)) $searchdir = $searchdir . "/modules";
 			if (preg_match('/@/',$domain))	$searchdir = $searchdir."/".(!empty($modulename)?$modulename:$newdomain)."/langs";
 			else $searchdir=$searchdir."/langs";
 
diff --git a/htdocs/custom/modules/index.php b/htdocs/custom/includes/index.php
similarity index 100%
rename from htdocs/custom/modules/index.php
rename to htdocs/custom/includes/index.php
diff --git a/htdocs/custom/pdf/index.php b/htdocs/custom/includes/modules/commande/index.php
similarity index 100%
rename from htdocs/custom/pdf/index.php
rename to htdocs/custom/includes/modules/commande/index.php
diff --git a/htdocs/custom/triggers/index.php b/htdocs/custom/includes/modules/facture/index.php
similarity index 100%
rename from htdocs/custom/triggers/index.php
rename to htdocs/custom/includes/modules/facture/index.php
diff --git a/htdocs/custom/includes/modules/index.php b/htdocs/custom/includes/modules/index.php
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/custom/includes/modules/propale/index.php b/htdocs/custom/includes/modules/propale/index.php
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/custom/includes/triggers/index.php b/htdocs/custom/includes/triggers/index.php
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index 4d90239ec70..30b891b279e 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -589,8 +589,7 @@ function Activate($value,$withdeps=1)
         // Loop on each directory
         foreach ($conf->file->dol_document_root as $dol_document_root)
         {
-            if (preg_match('/custom$/i',$dol_document_root)) $dir = $dol_document_root . "/modules/";
-            else $dir = $dol_document_root."/includes/modules/";
+            $dir = $dol_document_root."/includes/modules/";
             
         	$found=@include_once($dir.$file);
             if ($found) break;
@@ -678,8 +677,7 @@ function UnActivate($value,$requiredby=1)
         // Loop on each directory
         foreach ($conf->file->dol_document_root as $dol_document_root)
         {
-            if (preg_match('/custom$/i',$dol_document_root)) $dir = $dol_document_root . "/modules/";
-            else $dir = $dol_document_root."/includes/modules/";
+            $dir = $dol_document_root."/includes/modules/";
         	
         	$found=@include_once($dir.$file);
             if ($found) break;
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 3a01ec385a4..a7d19f0d19e 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -104,8 +104,7 @@ if (empty($dolibarr_main_data_root))
 define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);			// Filesystem core php (htdocs)
 define('DOL_DATA_ROOT', $dolibarr_main_data_root);					// Filesystem data (documents)
 define('DOL_CLASS_PATH', 'class/');									// Filesystem path to class dir
-define('DOL_CUSTOM_PATH', DOL_DOCUMENT_ROOT . '/custom');			// Filesystem path to custom dir
-define('DOL_DOCUMENT_EXTMODULE', DOL_CUSTOM_PATH . '/modules');			// Filesystem path to external modules dir
+define('DOL_DOCUMENT_EXTMODULE', $dolibarr_main_document_root_alt);	// Filesystem path to external modules dir
 // If dolibarr_main_url_root = auto (Hidden feature for developers only), we try to forge it.
 if ($dolibarr_main_url_root == 'auto' && ! empty($_SERVER["SCRIPT_URL"]) && ! empty($_SERVER["SCRIPT_URI"]))
 {
@@ -117,7 +116,7 @@ $suburi = strstr ($uri, '/');		// $suburi contains url without domain
 if ($suburi == '/') $suburi = '';	// If $suburi is /, it is now ''
 define('DOL_URL_ROOT', $suburi);	// URL relative root ('', '/dolibarr', ...)
 if (! empty($dolibarr_main_url_root_static)) define('DOL_URL_ROOT_FULL_STATIC', $dolibarr_main_url_root_static);	// Used to put static images on another domain
-define('DOL_URL_EXTMODULE', DOL_URL_ROOT . '/custom/modules');	// URL relative for external modules
+define('DOL_URL_EXTMODULE', $dolibarr_main_url_root_alt);	// URL relative for external modules
 
 /*
  * Include functions
@@ -189,7 +188,7 @@ $conf->file->character_set_client=strtoupper($force_charset_do_notuse);
 $conf->file->cookie_cryptkey = empty($dolibarr_main_cookie_cryptkey)?'':$dolibarr_main_cookie_cryptkey;
 
 // Define array of document root directories
-$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT, DOL_CUSTOM_PATH);
+$conf->file->dol_document_root=array(DOL_DOCUMENT_ROOT);
 if (! empty($dolibarr_main_document_root_alt))
 {
 	// dolibarr_main_document_root_alt contains several directories