Index: Config.kmk
===================================================================
--- Config.kmk	(revision 51616)
+++ Config.kmk	(working copy)
@@ -552,6 +552,10 @@
 #VBOX_WITHOUT_COM = 1
 # The webservices api.
 VBOX_WITH_WEBSERVICES = 1
+VBOX_WS_WITH_GLUE_PYTHON = 1
+VBOX_WS_WITH_PYTHON = 1
+VBOX_WS_WITH_PERL = 1
+VBOC_WS_WITH_PHP = 1
 VBOX_WITH_WEBSERVICES_SSL = 1
 # The Qt 4 GUI.
 VBOX_WITH_QTGUI = 1
@@ -577,6 +581,10 @@
 VBOX_WITH_VRDP_RDESKTOP = 1
 ## The Direct Framebuffer GUI.
 #VBOX_WITH_VBOXFB = 1
+# Enables MSCOM creation as per default, not to break new build
+if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+ VBOX_WITH_MSCOM = 1
+endif
 # Enables the Python<->XPCOM and Python<->COM bindings.
 VBOX_WITH_PYTHON ?= 1
 if1of ($(KBUILD_TARGET), darwin linux solaris)
Index: src/VBox/Main/Makefile.kmk
===================================================================
--- src/VBox/Main/Makefile.kmk	(revision 51616)
+++ src/VBox/Main/Makefile.kmk	(working copy)
@@ -28,7 +28,7 @@
 #
 # Include sub-makefile(s).
 #
-ifdef VBOX_WITH_WEBSERVICES
+if defined(VBOX_WITH_WEBSERVICES) || defined(VBOX_ONLY_SDK)
  include $(PATH_SUB_CURRENT)/webservice/Makefile.kmk
 endif
 include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
@@ -86,7 +86,7 @@
 VBOX_IDL_HEADER.XPCOM  = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
 
 # The MS COM specific stuff.
-if defined(VBOX_ONLY_SDK) || "$(KBUILD_TARGET)" == "win"
+if defined(VBOX_WITH_MSCOM) 
  OTHERS         += \
 	$(VBOX_IDL_FILE.MSCOM)
  OTHER_CLEAN    += \
Index: src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- src/VBox/Main/webservice/Makefile.kmk	(revision 51616)
+++ src/VBox/Main/webservice/Makefile.kmk	(working copy)
@@ -536,15 +536,26 @@
   $(shell find $(1) -name \*.java)
  endef
 
- VBOXWEB_OTHERS               +=  \
-	$(VBOXWEB_GLUE_PYTHON) 	  \
-	$(VBOXWEB_WS_PYTHON)      \
-	$(VBOXWEB_WS_PERL)        \
-	$(VBOXWEB_WS_PHP)         \
-	$(VBOXWEB_PYTHONWSSAMPLE) \
-	$(PATH_ROOT)
+ifdef VBOX_WS_WITH_GLUE_PYTHON
+ VBOXWEB_OTHERS += $(VBOXWEB_GLUE_PYTHON)
+endif
 
+ifdef VBOX_WS_WITH_PYTHON
+ VBOXWEB_OTHERS += $(VBOXWEB_WS_PYTHON)
+ VBOXWEB_OTHERS += $(VBOXWEB_PYTHONWSSAMPLE)
+endif
 
+ifdef VBOX_WS_WITH_PERL
+ VBOXWEB_OTHERS += $(VBOXWEB_WS_PERL)
+endif
+
+ifdef VBOX_WS_WITH_PHP
+ VBOXWEB_OTHERS += $(VBOXWEB_WS_PHP)
+endif
+
+ VBOXWEB_OTHERS += $(PATH_ROOT)
+
+
  #
  # Install sample code.
  #
@@ -606,34 +617,42 @@
 
 ifdef VBOX_ONLY_SDK
 
-$(VBOXWEB_GLUE_PYTHON): $(VBOXWEB_IDL_SRC) $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $(VBOX_PATH_WEBSERVICE)/websrv-python.xsl
+ifdef VBOX_WS_WITH_GLUE_PYTHON
+ $(VBOXWEB_GLUE_PYTHON): $(VBOXWEB_IDL_SRC) $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL) $(VBOX_PATH_WEBSERVICE)/websrv-python.xsl
 	$(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using websrv-python.xsl)
 	$(QUIET)$(RM) -f -- $@
 	$(QUIET)$(MKDIR) -p $(@D)
 	$(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-python.xsl $<
+endif
 
-$(VBOXWEB_WS_PYTHON): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
+ifdef VBOX_WS_WITH_PYTHON
+ $(VBOXWEB_WS_PYTHON): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
 	$(call MSG_GENERATE,,$@, WS Python bindings)
 	$(QUIET)$(RM) -f -- $@
 	$(QUIET)$(MKDIR) -p $(@D)
-# Try both w/o and with --file option
+ # Try both w/o and with --file option
 	$(QUIET)$(REDIRECT) -C $(@D) -- $(SHELL) -c "$(VBOX_WSDL2PY) -b $(VBOXWEBSERVICE_WSDL) || $(VBOX_WSDL2PY) -b  --file $(VBOXWEBSERVICE_WSDL)"
 	$(QUIET)$(APPEND) $@ ''
+endif
 
-$(VBOXWEB_WS_PERL): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
+ifdef VBOX_WS_WITH_PERL
+ $(VBOXWEB_WS_PERL): $(VBOXWEB_WSDL) $(VBOXWEBSERVICE_WSDL)
 	$(call MSG_GENERATE,,$@, WS Perl bindings)
 	$(QUIET)$(MKDIR) -p $(@D)
 	$(QUIET)$(REDIRECT) -C $(@D) -- $(VBOX_STUBMAKER) file://$(VBOXWEBSERVICE_WSDL)
-# Ugly, ugly, ugly, make me right once
+ # Ugly, ugly, ugly, make me right once
 	$(QUIET)$(SED) -e "s+http://www.virtualbox.org/Service+http://www.virtualbox.org/+" < $(VBOXWEB_WS_PERL) > $(VBOXWEB_WS_PERL).tmp
 	$(QUIET)$(MV) $(VBOXWEB_WS_PERL).tmp $(VBOXWEB_WS_PERL)
 	$(QUIET)$(APPEND) $@ ''
+endif
 
-$(VBOXWEB_WS_PHP): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-php.xsl
+ifdef VBOX_WS_WITH_PHP
+ $(VBOXWEB_WS_PHP): $(VBOXWEB_IDL_SRC) $(VBOX_PATH_WEBSERVICE)/websrv-php.xsl
 	$(call MSG_GENERATE,,$@,$(VBOXWEB_IDL_SRC) using websrv-php.xsl)
 	$(QUIET)$(RM) -f -- $@
 	$(QUIET)$(MKDIR) -p $(@D)
 	$(QUIET)$(VBOX_XSLTPROC) $(VBOXWEB_XSLTPROC_VERBOSE) -o $@ $(VBOX_PATH_WEBSERVICE)/websrv-php.xsl $<
+endif
 
 endif # VBOX_ONLY_SDK