Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 55805)
+++ /trunk/Config.kmk	(revision 55806)
@@ -585,6 +585,10 @@
 ## The Direct Framebuffer GUI.
 #VBOX_WITH_VBOXFB = 1
-# Enables the Python<->XPCOM and Python<->COM bindings.
+# Enables the Python<->XPCOM, Python<->COM and (WS enabled) Python<->WS bindings.
 VBOX_WITH_PYTHON ?= 1
+# Enables the PERL<->WS binding (if WS enabled).
+#VBOX_WITH_PERL ?= 1
+# Enables the PHP<->WS binding (if WS enabled).
+VBOX_WITH_PHP ?= 1
 if1of ($(KBUILD_TARGET), darwin linux solaris)
  # Enable Java<->XPCOM bridge + glue code
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 55805)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 55806)
@@ -7,5 +7,5 @@
 
 #
-# Copyright (C) 2007-2013 Oracle Corporation
+# Copyright (C) 2007-2015 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -528,5 +528,5 @@
  #
  VBOXWEB_GLUE_PYTHON           = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_wrappers.py
- VBOXWEB_WS_PYTHON             = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_services.py
+ VBOXWEB_WS_PYTHON             = $(VBOX_PATH_SDK)/bindings/webservice/python/lib/VirtualBox_server.py
  VBOXWEB_WS_PERL               = $(VBOX_PATH_SDK)/bindings/webservice/perl/lib/vboxService.pm
  VBOXWEB_WS_PHP                = $(VBOX_PATH_SDK)/bindings/webservice/php/lib/vboxServiceWrappers.php
@@ -540,9 +540,8 @@
 
  VBOXWEB_OTHERS               +=  \
-	$(VBOXWEB_GLUE_PYTHON) 	  \
-	$(VBOXWEB_WS_PYTHON)      \
-	$(VBOXWEB_WS_PERL)        \
-	$(VBOXWEB_WS_PHP)         \
-	$(VBOXWEB_PYTHONWSSAMPLE) \
+	$(if $(VBOX_WITH_PYTHON),$(VBOXWEB_GLUE_PYTHON),)       \
+	$(if $(VBOX_WITH_PYTHON),$(VBOXWEB_WS_PYTHON),)         \
+	$(if $(VBOX_WITH_PERL),$(VBOXWEB_WS_PERL),)             \
+	$(if $(VBOX_WITH_PHP),$(VBOXWEB_WS_PHP),)               \
 	$(PATH_ROOT)
 
@@ -555,7 +554,7 @@
  vboxwebinst_MODE = a+rx,u+w
  vboxwebinst_SOURCES = \
-	samples/perl/clienttest.pl=>perl/samples/clienttest.pl \
-	samples/php/clienttest.php=>php/samples/clienttest.php \
-	samples/python/clienttest.py=>python/samples/clienttest.py
+	$(if $(VBOX_WITH_PERL),samples/perl/clienttest.pl=>perl/samples/clienttest.pl,) \
+	$(if $(VBOX_WITH_PHP),samples/php/clienttest.php=>php/samples/clienttest.php,) \
+	$(if $(VBOX_WITH_PYTHON),samples/python/clienttest.py=>python/samples/clienttest.py,)
 
  INSTALLS += vboxwebinst_nox
@@ -563,7 +562,7 @@
  vboxwebinst_nox_MODE = a+r,u+w
  vboxwebinst_nox_SOURCES = \
-	samples/python/Makefile=>python/samples/Makefile \
-	samples/python/Makefile.glue=>python/lib/Makefile \
-	$(PATH_ROOT)/COPYING.LIB=>java/jax-ws/COPYING.LIB
+	$(if $(VBOX_WITH_PYTHON),samples/python/Makefile=>python/samples/Makefile,) \
+	$(if $(VBOX_WITH_PYTHON),samples/python/Makefile.glue=>python/lib/Makefile,) \
+	$(if ($VBOX_WITH_JWS),$(PATH_ROOT)/COPYING.LIB=>java/jax-ws/COPYING.LIB,)
 
  INSTALLS += vboxwebinst_wsdl