diff --git a/windows_deliv/menu.bat b/windows_deliv/menu.bat
index 38ab593..f349163 100644
--- a/windows_deliv/menu.bat
+++ b/windows_deliv/menu.bat
@@ -1,7 +1,7 @@
 @echo off
 setlocal
+set TCCLECMD="C:\Program Files\JPSoft\TCCLE14x64\tcc.exe"
 set TCCLECMD="C:\apps\JPSoft\TCCLE14x64\tcc.exe"
-::set TCCLECMD="C:\Program Files\JPSoft\TCCLE14x64\tcc.exe"
 
 echo EiffelStudio delivery:
 
@@ -11,26 +11,37 @@ echo EiffelStudio delivery:
 @echo 4: starting environment
 @echo 5: bootstrap environment
 @echo 6: display logs
-@echo 7: make_gpl_delivery
-@echo 8: make_gpl_installation
+@echo 7: GPL only
 @echo -------------------
 @echo i: display info
 @echo -------------------
 @echo q: quit
 
-CHOICE /C 12345678iq /M " > selection:"
+CHOICE /C 1234567iq /M " > selection:"
 if .%ERRORLEVEL%. == .1. GOTO make_delivery
 if .%ERRORLEVEL%. == .2. GOTO make_exes
 if .%ERRORLEVEL%. == .3. GOTO make_installations
 if .%ERRORLEVEL%. == .4. GOTO starting_env
 if .%ERRORLEVEL%. == .5. GOTO bootstrap_env
 if .%ERRORLEVEL%. == .6. GOTO display_logs
-if .%ERRORLEVEL%. == .7. GOTO make_gpl_delivery
-if .%ERRORLEVEL%. == .8. GOTO make_gpl_installation
+if .%ERRORLEVEL%. == .7. GOTO menu_gpl
 if .%ERRORLEVEL%. == .9. GOTO display_info
 if .%ERRORLEVEL%. == .10. goto end
 goto end
 
+:menu_gpl
+set NO_ENTERPRISE_BUILD="True"
+echo EiffelStudio GPL delivery:
+@echo 1: make_delivery
+@echo 2: make_exes
+@echo 3: make_installation
+CHOICE /C 1234567iq /M " > selection:"
+if .%ERRORLEVEL%. == .1. GOTO make_delivery
+if .%ERRORLEVEL%. == .2. GOTO make_exes
+if .%ERRORLEVEL%. == .3. GOTO make_installations
+if .%ERRORLEVEL%. == .10. goto end
+goto end
+
 :make_delivery
 %TCCLECMD% /C make_delivery.btm
 goto end