diff --git a/windows_deliv/compile_c_libraries.btm b/windows_deliv/compile_c_libraries.btm
index e60622a..b168724 100644
--- a/windows_deliv/compile_c_libraries.btm
+++ b/windows_deliv/compile_c_libraries.btm
@@ -13,7 +13,9 @@ iff not defined NO_COMPILE then
 	safe_md headers
 	REM "We keep a copy of vendors specific header files at EiffelSoftware as they cannot be"
 	REM "redistributed freely."
-	exprtfile %DEFAULT_ISE_SVN/Src/library/headers.tar.gz > headers\headers.tar.gz
+	if not EXIST headers\headers.tar.gz (
+		exprtfile %DEFAULT_ISE_SVN/Src/library/headers.tar.gz > headers\headers.tar.gz
+	)
 	cd headers
 	tar xvfz headers.tar.gz
 	iff not isdir apps then
diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm
index d76ec9c..a9b2d82 100644
--- a/windows_deliv/etc/config.btm
+++ b/windows_deliv/etc/config.btm
@@ -15,7 +15,7 @@ endiff
 
 REM General configuration
 iff not defined STUDIO_VERSION_MAJOR_MINOR then
-	set STUDIO_VERSION_MAJOR_MINOR=18.11
+	set STUDIO_VERSION_MAJOR_MINOR=19.01
 endiff
 
 iff not defined WORK_DIR then
diff --git a/windows_deliv/install/includes/Preprocessors.wxi b/windows_deliv/install/includes/Preprocessors.wxi
index e481828..9478eaf 100644
--- a/windows_deliv/install/includes/Preprocessors.wxi
+++ b/windows_deliv/install/includes/Preprocessors.wxi
@@ -30,19 +30,19 @@
         <?define LicenseFile = "gpl.rtf"?>
       <?endif?>
       <?ifdef x64?>
-        <?define ProductGuid = "F7D6C690-EC35-C4C3-7A50-00008ACC496D" ?>
-        <?define RegistriesGuid = "2229FB66-8B4E-218C-484D-8573938B9437" ?>
-        <?define ShortcutsGuid = "5B2CA393-EF3B-50DE-8854-18530D291BBF" ?>
+        <?define ProductGuid = "00C1CA54-B234-43F7-8821-1488E8224BD3" ?>
+        <?define RegistriesGuid = "E8B890D0-3118-402E-8E90-BD401CD3DD89" ?>
+        <?define ShortcutsGuid = "8627643F-4630-4649-9AA5-E6BC78674934" ?>
       <?else?>
-        <?define ProductGuid = "B9B525CF-4DFB-3150-0060-64A4788E2142" ?>
-        <?define RegistriesGuid = "E32C6AE0-B9FD-2FE4-5405-39A39E3BDA04" ?>
-        <?define ShortcutsGuid = "AC48CF2C-65CF-8056-09C3-6FFBB6C8D9B4" ?>
+        <?define ProductGuid = "2E2B8DDA-0AF3-4FD9-AC40-5C862846307C" ?>
+        <?define RegistriesGuid = "FDC60BBD-74C9-40A8-9322-D6872738BD80" ?>
+        <?define ShortcutsGuid = "8DEF0013-A478-432F-B698-BB52844FBD8F" ?>
       <?endif?>
-      <?define UpgradeGuid = "F7F00C79-1833-49A2-8DDB-17AB76E2AB14" ?>
+      <?define UpgradeGuid = "9E70F3A9-F792-4AA6-8F52-5351365B85D5" ?>
       <?define Product = "EiffelStudio" ?>
-      <?define ProductVersion = "18.11" ?>
-      <?define ProductDescription = "EiffelStudio 18.11 Integrated Development Environment (IDE) Installer" ?>
-      <?define ProductKey = "Eiffel_18.11" ?>
+      <?define ProductVersion = "19.01" ?>
+      <?define ProductDescription = "EiffelStudio 19.01" Integrated Development Environment (IDE) Installer" ?>
+      <?define ProductKey = "Eiffel_19.01" ?>
     <?else?>
       <?ifdef EiffelEnvision?>
         <?ifdef Enterprise?>
@@ -61,7 +61,7 @@
         <?define Product = "EiffelEnvision" ?>
         <?define ProductVersion = "2.8" ?>
         <?define ProductDescription = "EiffelEnvision 2.8 The Eiffel for .NET Language Package for Visual Studio .NET 2005" ?>
-        <?define ProductKey = "Eiffel_18.11" ?>
+        <?define ProductKey = "Eiffel_19.01" ?>
       <?else?>
         <?define Edition = "Test"?>
         <?define LicenseFile = "gpl.rtf"?>
@@ -70,7 +70,7 @@
         <?define Product = "EiffelStudio" ?>
         <?define ProductVersion = "2.8" ?>
         <?define ProductDescription = "Test" ?>
-        <?define ProductKey = "Eiffel_18.11" ?>
+        <?define ProductKey = "Eiffel_19.01" ?>
       <?endif?>
     <?endif?>
     <?define ProductName = "$(var.Product) $(var.ProductVersion) ($(var.Platform)) $(var.Edition)" ?>
diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm
index 202c088..903d8d0 100644
--- a/windows_deliv/make_delivery.btm
+++ b/windows_deliv/make_delivery.btm
@@ -317,12 +317,14 @@ iff not defined NO_COMPILE then
 	cdd %EIFFEL_SRC\..
 	co -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src %EIFFEL_SRC
 
-	remtrace ISE specific files
-	cdd %EIFFEL_SRC
-	co %DEFAULT_ISE_SVN/Src/library/keygen library/keygen
-	cd tools
-	co %DEFAULT_ISE_SVN/Src/tools/activation activation
-	co %DEFAULT_ISE_SVN/Src/tools/estudio_enterprise estudio_enterprise
+	iff not defined NO_ENTERPRISE_BUILD then
+		remtrace ISE specific files
+		cdd %EIFFEL_SRC
+		co %DEFAULT_ISE_SVN/Src/library/keygen library/keygen
+		cd tools
+		co %DEFAULT_ISE_SVN/Src/tools/activation activation
+		co %DEFAULT_ISE_SVN/Src/tools/estudio_enterprise estudio_enterprise
+	endiff
 
 	remtrace Build the normal libraries
 	cdd %INIT_DIR