diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 53733617de1..779896ccbf2 100644
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -280,6 +280,7 @@ if ($nboftargetok) {
     	if ($target eq 'TGZ') {
     		print "Rename $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ\n";
 			rename("$BUILDROOT/$PROJECT","$BUILDROOT/$FILENAMETGZ");
+    		print "Remove target $FILENAMETGZ.tgz...\n";
     		unlink("$FILENAMETGZ.tgz");
     		print "Compress $FILENAMETGZ into $FILENAMETGZ.tgz...\n";
    		    $cmd="tar --exclude-vcs --exclude-from \"$DESTI/tgz/tar_exclude.txt\" --directory \"$BUILDROOT\" --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" $FILENAMETGZ";
diff --git a/build/makepack-dolibarrmodule.pl b/build/makepack-dolibarrmodule.pl
index e3536454625..09924575efe 100644
--- a/build/makepack-dolibarrmodule.pl
+++ b/build/makepack-dolibarrmodule.pl
@@ -199,15 +199,20 @@ if ($nboftargetok) {
         print "\nBuild package for target $target\n";
         
     	if ($target eq 'TGZ') {
-    		unlink $FILENAMETGZ.tgz;
+    		print "Remove target $FILENAMETGZ.tgz...\n";
+    		unlink("$DESTI/$FILENAMETGZ.tgz");
     		print "Compress $BUILDROOT/* into $FILENAMETGZ.tgz...\n";
-   		    $cmd="tar --exclude-vcs --directory \"$BUILDROOT\" --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
+   		    $cmd="tar --exclude-vcs --exclude *.tgz --directory \"$BUILDROOT\" --group=500 --owner=500 -czvf \"$FILENAMETGZ.tgz\" .";
    		    $ret=`$cmd`;
             if ($OS =~ /windows/i) {
         		print "Move $FILENAMETGZ.tgz to $DESTI/$FILENAMETGZ.tgz\n";
         		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
             }
-    		next;
+            else
+            {
+        		$ret=`mv "$FILENAMETGZ.tgz" "$DESTI/$FILENAMETGZ.tgz"`;
+            }
+            next;
     	}
 
     	if ($target eq 'ZIP') {