Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 52909)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 52910)
@@ -51,10 +51,6 @@
 #
 ifndef VBOX_INSTALLER_LANGUAGES
- ifdef VBOX_WITH_MSM_INSTALL ## @todo Dunno why this has to be this way, ask Andy.
-  VBOX_INSTALLER_LANGUAGES = en_US
- else
-  VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
-  VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
- endif
+ VBOX_INSTALLER_LANGUAGES  = en_US de_DE fr_FR it_IT zh_TW
+ VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
 endif
 
@@ -68,5 +64,8 @@
 
 # We only ship the merge modules in locale en_US for the moment.
-VBOX_INSTALLER_MERGE_LANGUAGES = $(VBOX_INSTALLER_LANGUAGES)
+ifdef VBOX_WITH_MSM_INSTALL
+ VBOX_INSTALLER_LANGUAGES := en_US
+ VBOX_INSTALLER_MERGE_LANGUAGES = $(VBOX_INSTALLER_LANGUAGES)
+endif
 
 #
@@ -74,7 +73,7 @@
 # so just define the branding targets to use the English one for now.
 # The installer generation assumes that there is a translation for each
-# of VBOX_LICENSE_ADD_LANGUAGES.
-#
-$(foreach lang,$(VBOX_LICENSE_ADD_LANGUAGES), \
+# of VBOX_INSTALLER_LANGUAGES.
+#
+$(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
 	$(eval VBOX_BRAND_$(lang)_LICENSE_RTF := $(VBOX_BRAND_LICENSE_RTF)))