diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index bad0bf9f48c..941cb03d6c4 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -720,10 +720,11 @@ function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
  * @param	int		$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
  * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
  * @param	array	$arrayreplacement	Array to use to replace filenames with another one during the copy (works only on file names, not on directory names).
+ * @param	int		$excludesubdir		0=Do not exclude subdirectories, 1=Exclude subdirectories, 2=Exclude subdirectories if name is not a 2 chars (used for country codes subdirectories).
  * @return	int							<0 if error, 0 if nothing done (all files already exists and overwriteifexists=0), >0 if OK
  * @see		dol_copy()
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0)
 {
 	global $conf;
 
@@ -759,8 +760,10 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 			{
 				if (is_dir($ossrcfile."/".$file))
 				{
-					//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-					$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement);
+					if (empty($excludesubdir) || ($excludesubdir == 2 && strlen($file) == 2)) {
+						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
+						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
+					}
 				}
 				else
 				{
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 6455b7538e0..4edd2367758 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -251,8 +251,9 @@ class Website extends CommonObject
 
 	    if (! $error) {
 	    	$stringtodolibarrfile = "# Some properties for Dolibarr web site CMS\n";
-	    	$stringtodolibarrfile .= "noclone=dir_list_to_exclude_when_cloning_separated_with_comma\n";
-			file_put_contents('.dolibarr', $stringtodolibarrfile);
+	    	$stringtodolibarrfile .= "param=value\n";
+	    	//print $conf->website->dir_output.'/'.$this->ref.'/.dolibarr';exit;
+	    	file_put_contents($conf->website->dir_output.'/'.$this->ref.'/.dolibarr', $stringtodolibarrfile);
         }
 
 		// Commit or rollback
@@ -674,7 +675,7 @@ class Website extends CommonObject
 
 		if (!$error)
 		{
-			dolCopyDir($pathofwebsiteold, $pathofwebsitenew, $conf->global->MAIN_UMASK, 0);
+			dolCopyDir($pathofwebsiteold, $pathofwebsitenew, $conf->global->MAIN_UMASK, 0, null, 2);
 
 			// Check symlink to medias and restore it if ko
 			$pathtomedias = DOL_DATA_ROOT.'/medias'; // Target