diff --git a/windows_deliv/etc/config.btm b/windows_deliv/etc/config.btm
index 7535506..5be7194 100644
--- a/windows_deliv/etc/config.btm
+++ b/windows_deliv/etc/config.btm
@@ -17,7 +17,7 @@ endiff
 
 REM General configuration
 iff not defined STUDIO_VERSION_MAJOR_MINOR then
-	set STUDIO_VERSION_MAJOR_MINOR=18.05
+	set STUDIO_VERSION_MAJOR_MINOR=18.06
 endiff
 
 iff not defined WORK_DIR then
diff --git a/windows_deliv/install/includes/Preprocessors.wxi b/windows_deliv/install/includes/Preprocessors.wxi
index a758600..fe7926e 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 = "C0ECCD9E-FB11-49C8-BB76-D3466CCF8803" ?>
-        <?define RegistriesGuid = "B583F10F-575B-471E-9D5B-716CE7FB7AAA" ?>
-        <?define ShortcutsGuid = "15029359-1ECF-475D-BDAC-FBFDE875B58C" ?>
+        <?define ProductGuid = "9CCB7F8C-7AC0-44d0-8F0F-F17A1E4E0161" ?>
+        <?define RegistriesGuid = "238E308A-4805-4803-AE76-105BD697B236" ?>
+        <?define ShortcutsGuid = "D52D8C72-06D3-4bde-A27F-00A184062D70" ?>
       <?else?>
-        <?define ProductGuid = "5584AB7C-AE11-4CC5-A5CC-30BAB02844D8" ?>
-        <?define RegistriesGuid = "86ED8CF2-CC48-4D46-A9F5-A6B1D7347736" ?>
-        <?define ShortcutsGuid = "A68AC36A-E574-49AE-8870-8599923F5D0A" ?>
+        <?define ProductGuid = "9ABBC2D5-C6AE-4816-B34F-CE4C3A5BCC45" ?>
+        <?define RegistriesGuid = "67E1AF55-FD3D-4a92-97CF-DE7D195A485F" ?>
+        <?define ShortcutsGuid = "2697FFE1-80F1-445a-8745-E0913FCA69CB" ?>
       <?endif?>
-      <?define UpgradeGuid = "807C2196-0BDD-4C4D-96C6-B94E3EDC8C99" ?>
+      <?define UpgradeGuid = "8F2F7FDA-F3F9-4ebc-8FF3-E320EE191970" ?>
       <?define Product = "EiffelStudio" ?>
-      <?define ProductVersion = "18.05" ?>
-      <?define ProductDescription = "EiffelStudio 18.05 Integrated Development Environment (IDE) Installer" ?>
-      <?define ProductKey = "Eiffel_18.05" ?>
+      <?define ProductVersion = "18.06" ?>
+      <?define ProductDescription = "EiffelStudio 18.06 Integrated Development Environment (IDE) Installer" ?>
+      <?define ProductKey = "Eiffel_18.06" ?>
     <?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.05" ?>
+        <?define ProductKey = "Eiffel_18.06" ?>
       <?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.05" ?>
+        <?define ProductKey = "Eiffel_18.06" ?>
       <?endif?>
     <?endif?>
     <?define ProductName = "$(var.Product) $(var.ProductVersion) ($(var.Platform)) $(var.Edition)" ?>