diff --git a/build/exe/dolibarr.nsi b/build/exe/dolibarr.nsi
index 47b03a336b3..ea8785f762c 100644
--- a/build/exe/dolibarr.nsi
+++ b/build/exe/dolibarr.nsi
@@ -5,7 +5,8 @@
 
 
 !define MUI_PROD "Dolibarr" ;Define your own software name here
-#!define MUI_VERSION_DOT "2.0" ;Define your own software version here
+!define MUI_PRODUCT "Dolibarr 2.0.0 beta1" ;Define your own uninstall software name here
+!define MUI_VERSION_DOT "2.0.0-beta1" ;Define your own software version here
 !define MUI_PUBLISHER "Rodolphe Quiedeville, Laurent Destailleur"
 !define MUI_URL "http://dolibarr.com"
 !define MUI_COMMENTS "Thanks for using Dolibarr"
@@ -173,6 +174,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\CVS"
     RMDir /r "$INSTDIR\doc\CVS"
     RMDir /r "$INSTDIR\doc\dev\CVS"
+    RMDir /r "$INSTDIR\doc\dev\dbmodel\CVS"
     RMDir /r "$INSTDIR\doc\dev\php\CVS"
     RMDir /r "$INSTDIR\doc\dev\php\html\CVS"
     RMDir /r "$INSTDIR\doc\dev\php\latex\CVS"
@@ -184,6 +186,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\admin\CVS"
     RMDir /r "$INSTDIR\htdocs\admin\system\CVS"
     RMDir /r "$INSTDIR\htdocs\admin\update\CVS"
+    RMDir /r "$INSTDIR\htdocs\bookmarks\CVS"
     RMDir /r "$INSTDIR\htdocs\boutique\auteur\CVS"
     RMDir /r "$INSTDIR\htdocs\boutique\client\CVS"
     RMDir /r "$INSTDIR\htdocs\boutique\commande\CVS"
@@ -223,6 +226,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\compta\stats\CVS"
     RMDir /r "$INSTDIR\htdocs\compta\tva\CVS"
     RMDir /r "$INSTDIR\htdocs\compta\ventilation\CVS"
+    RMDir /r "$INSTDIR\htdocs\compta\ventilation\fournisseur\CVS"
     RMDir /r "$INSTDIR\htdocs\compta\voyage\CVS"
     RMDir /r "$INSTDIR\htdocs\conf\CVS"
     RMDir /r "$INSTDIR\htdocs\contact\CVS"
@@ -231,22 +235,25 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\domain\CVS"
     RMDir /r "$INSTDIR\htdocs\dossier\CVS"
     RMDir /r "$INSTDIR\htdocs\dossier\client\CVS"
+    RMDir /r "$INSTDIR\htdocs\energie\CVS"
     RMDir /r "$INSTDIR\htdocs\expedition\CVS"
     RMDir /r "$INSTDIR\htdocs\expedition\mods\CVS"
     RMDir /r "$INSTDIR\htdocs\expedition\mods\pdf\CVS"
     RMDir /r "$INSTDIR\htdocs\expedition\stats\CVS"
+    RMDir /r "$INSTDIR\htdocs\exports\CVS"
     RMDir /r "$INSTDIR\htdocs\fichinter\CVS"
     RMDir /r "$INSTDIR\htdocs\fourn\CVS"
     RMDir /r "$INSTDIR\htdocs\fourn\commande\CVS"
     RMDir /r "$INSTDIR\htdocs\fourn\facture\CVS"
+    RMDir /r "$INSTDIR\htdocs\fourn\paiement\CVS"
     RMDir /r "$INSTDIR\htdocs\fourn\product\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\boxes\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\fpdf\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\fpdf\code39ext\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\fpdf\font\CVS"
-    RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf152\CVS"
-    RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf152\font\CVS"
+    RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf\CVS"
+    RMDir /r "$INSTDIR\htdocs\includes\fpdf\fpdf\font\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\fpdf\i25\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\magpierss\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\magpierss\extlib\CVS"
@@ -255,6 +262,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\includes\menus\barre_left\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\commande\CVS"
+    RMDir /r "$INSTDIR\htdocs\includes\modules\dons\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\expedition\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\deneb\CVS"
@@ -266,6 +274,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\neptune\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\pluton\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\saturne\CVS"
+    RMDir /r "$INSTDIR\htdocs\includes\modules\facture\terre\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\uranus\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\facture\venus\CVS"
     RMDir /r "$INSTDIR\htdocs\includes\modules\fichinter\CVS"
@@ -311,6 +320,8 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\product\stats\CVS"
     RMDir /r "$INSTDIR\htdocs\product\stock\CVS"
     RMDir /r "$INSTDIR\htdocs\projet\CVS"
+    RMDir /r "$INSTDIR\htdocs\projet\activity\CVS"
+    RMDir /r "$INSTDIR\htdocs\projet\tasks\CVS"
     RMDir /r "$INSTDIR\htdocs\public\adherents\CVS"
     RMDir /r "$INSTDIR\htdocs\public\CVS"
     RMDir /r "$INSTDIR\htdocs\public\dons\CVS"
@@ -324,6 +335,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\telephonie\config\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\contrat\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\distributeurs\CVS"
+    RMDir /r "$INSTDIR\htdocs\telephonie\distributeurs\comm\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\facture\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\fournisseur\commande\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\fournisseur\CVS"
@@ -332,12 +344,15 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\telephonie\ligne\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\pdf\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\script\CVS"
+    RMDir /r "$INSTDIR\htdocs\telephonie\script\tools\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\service\CVS"
+    RMDir /r "$INSTDIR\htdocs\telephonie\service\modules\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\sql\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\clients\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\commerciaux\groupes\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\commerciaux\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\communications\CVS"
+    RMDir /r "$INSTDIR\htdocs\telephonie\stats\consultation\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\contrats\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\destinations\CVS"
     RMDir /r "$INSTDIR\htdocs\telephonie\stats\distributeurs\CVS"
@@ -357,6 +372,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\theme\eldy\img\CVS"
     RMDir /r "$INSTDIR\htdocs\theme\freelug\CVS"
     RMDir /r "$INSTDIR\htdocs\theme\freelug\img\CVS"
+    RMDir /r "$INSTDIR\htdocs\theme\rodolphe\CVS"
     RMDir /r "$INSTDIR\htdocs\theme\yellow\CVS"
     RMDir /r "$INSTDIR\htdocs\theme\yellow\img\CVS"
     RMDir /r "$INSTDIR\htdocs\user\CVS"
@@ -364,6 +380,7 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\htdocs\user\group\CVS"
     RMDir /r "$INSTDIR\htdocs\user\modules\CVS"
     RMDir /r "$INSTDIR\misc\CVS"
+    RMDir /r "$INSTDIR\misc\purgedemo\CVS"
     RMDir /r "$INSTDIR\mysql\CVS"
     RMDir /r "$INSTDIR\mysql\data\CVS"
     RMDir /r "$INSTDIR\mysql\data\dev\CVS"
@@ -375,6 +392,8 @@ Section "Clean CVS files" CvsClean
     RMDir /r "$INSTDIR\pgsql\tables\CVS"
     RMDir /r "$INSTDIR\scripts\adherents\CVS"
     RMDir /r "$INSTDIR\scripts\adherents\mailman\CVS"
+    RMDir /r "$INSTDIR\scripts\banque\CVS"
+    RMDir /r "$INSTDIR\scripts\energie\CVS"
     RMDir /r "$INSTDIR\scripts\lolix\CVS"
     RMDir /r "$INSTDIR\scripts\CVS"
     
@@ -415,6 +434,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Uninstall.exe"
 
   RMDir /r "$INSTDIR"
+  
+  DeleteRegKey /ifempty HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PROD}"
 
 SectionEnd