Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 88303)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 88304)
@@ -274,5 +274,5 @@
 	UserManual.pdf \
 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf)
- ifdef VBOX_WITH_DOCS_CHM
+ ifdef VBOX_WITH_DOCS_CHM_PACKING
   VBOX_LNX_NO_STRIP += \
   	VirtualBox.chm \
Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 88303)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 88304)
@@ -439,7 +439,9 @@
 ifdef VBOX_WITH_DOCS_PACKING
  SOLARIS_COMMON += \
-	VirtualBox.chm \
+	$(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
 	UserManual.pdf \
-	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
+	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
+		$(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
+		UserManual_$(f).pdf)
 endif
 
Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 88303)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 88304)
@@ -347,7 +347,9 @@
 	$(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
 ifdef VBOX_WITH_DOCS_PACKING
+ ifdef VBOX_WITH_DOCS_CHM_PACKING
 	$(APPEND) $@ '	<File Id="file_VirtualBox.chm" Name="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(subst /,\,$(PATH_STAGE_BIN)/VirtualBox.chm)"></File>'
 	$(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
 		     '	<File Id="file_VirtualBox_$(lang).chm" Name="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(subst /,\,$(PATH_STAGE_BIN)/VirtualBox_$(lang).chm)"></File>')
+ endif
 endif
 	$(APPEND) $@ '</Include>'