Index: /trunk/src/VBox/Installer/win/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 65995)
+++ /trunk/src/VBox/Installer/win/Makefile.kmk	(revision 65996)
@@ -580,4 +580,5 @@
 		-E 'VBOX_WITH_VRDP=$(if-expr defined(VBOX_WITH_VRDP) && !defined(VBOX_WITH_EXTPACK_PUEL),yes,no)' \
 		-E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
+		-E 'VBOX_WITH_UNATTENDED=$(if $(VBOX_WITH_UNATTENDED),yes,no)' \
 		-E 'BUILD_TYPE=$(KBUILD_TYPE)' \
 		-E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
Index: /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 65995)
+++ /trunk/src/VBox/Installer/win/VBoxMergeApp.wxi	(revision 65996)
@@ -439,4 +439,5 @@
     </Component>
 
+<?if $(env.VBOX_WITH_UNATTENDED) = "yes" ?>
     <!-- Unattended templates -->
     <Directory Id="dir_VBoxUnattendedTemplates" Name="unattended_templates">
@@ -459,4 +460,5 @@
         </Component>
     </Directory>
+<?endif?>
 
 </Include>