Index: /trunk/src/VBox/Frontends/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/Makefile.kmk	(revision 19852)
+++ /trunk/src/VBox/Frontends/Makefile.kmk	(revision 19853)
@@ -45,4 +45,9 @@
 endif # !VBOX_ONLY_DOCS
 
+# @todo: include Python shell into binary delivery?
+ifdef VBOX_ONLY_SDK
+ include $(PATH_SUB_CURRENT)/VBoxShell/Makefile.kmk
+endif
+
 include $(KBUILD_PATH)/subfooter.kmk
 
Index: /trunk/src/VBox/Frontends/VBoxShell/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/Makefile.kmk	(revision 19853)
+++ /trunk/src/VBox/Frontends/VBoxShell/Makefile.kmk	(revision 19853)
@@ -0,0 +1,30 @@
+## @file
+# Sub-Makefile for the shell frontend.
+#
+
+#
+# Copyright (C) 2009 Sun Microsystems, Inc.
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+# Clara, CA 95054 USA or visit http://www.sun.com if you need
+# additional information or have any questions.
+#
+
+SUB_DEPTH = ../../../..
+include $(KBUILD_PATH)/subheader.kmk
+
+INSTALLS += VBoxShell
+VBoxShell_INST = $(INST_SDK)/bindings
+VBoxShell_SOURCES = \
+        vboxshell.py=>glue/python/sample/vboxshell.py     \
+        shellcommon.py=>glue/python/sample/shellcommon.py 
+
+include $(KBUILD_PATH)/subfooter.kmk
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 19852)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 19853)
@@ -88,7 +88,5 @@
  	$(VBOX_PATH_SDK)/bindings/mscom/include/VirtualBox.h \
  	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox.tlb \
- 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c \
- 	$(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py   \
- 	$(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
+ 	$(VBOX_PATH_SDK)/bindings/mscom/lib/VirtualBox_i.c 
  OTHER_CLEAN    += \
  	$(VBOX_IDL_FILE.MSCOM) \
@@ -98,7 +96,5 @@
  	$(PATH_VBoxCOM)/VirtualBox.h   \
  	$(PATH_VBoxCOM)/VirtualBox_i.c \
- 	$(PATH_VBoxCOM)/VirtualBox.tlb \
- 	$(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py \
- 	$(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
+ 	$(PATH_VBoxCOM)/VirtualBox.tlb 
 
  VBOX_MAIN_PREREQS += $(PATH_VBoxCOM)/VirtualBox_i.c
@@ -758,15 +754,4 @@
 	$(CP) $(PATH_VBoxCOM)/VirtualBox_i.c $(VBOX_PATH_SDK)/bindings/mscom/lib
 
-
-## @todo Use install targets, please.
-#        Actually, what on earth is this stuff doing? Why copy two files like this?
-$(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py \
-+ $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py: \
-		$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py \
-		$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/mscom/vboxshell.py
-	$(MKDIR) -p $(VBOX_PATH_SDK)/bindings/mscom/python/samples
-	$(CP) $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py     $(VBOX_PATH_SDK)/bindings/mscom/python/samples/shellcommon.py
-	$(CP) $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/mscom/vboxshell.py $(VBOX_PATH_SDK)/bindings/mscom/python/samples/vboxshell.py
-
 #
 # Translation stuff
Index: /trunk/src/VBox/Main/webservice/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 19852)
+++ /trunk/src/VBox/Main/webservice/Makefile.kmk	(revision 19853)
@@ -372,5 +372,4 @@
         $(VBOXWEB_WS_PERL) \
 	$(VBOXWEB_PYTHONWSSAMPLE)\
-	$(VBOXWEB_SHELLCOMMON) \
 	$(VBOXWEB_JAXWSSAMPLE) \
 	$(VBOXWEB_METRICSAMPLE) \
@@ -390,7 +389,5 @@
       samples/perl/clienttest.pl=>perl/samples/clienttest.pl \
       samples/python/Makefile=>python/samples/Makefile \
-      samples/python/Makefile.glue=>python/lib/Makefile \
-      $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/ws/vboxshell.py=>python/samples/vboxshell.py \
-      $(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py=>python/samples/shellcommon.py
+      samples/python/Makefile.glue=>python/lib/Makefile
 
  #
Index: /trunk/src/VBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Makefile.kmk	(revision 19852)
+++ /trunk/src/VBox/Makefile.kmk	(revision 19853)
@@ -45,4 +45,5 @@
  endif
  include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk
+ include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
 
 else
Index: /trunk/src/libs/xpcom18a4/Makefile.kmk
===================================================================
--- /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 19852)
+++ /trunk/src/libs/xpcom18a4/Makefile.kmk	(revision 19853)
@@ -1392,5 +1392,4 @@
  endif
  INSTALLS += VBoxPython-inst-py-xpcom
- INSTALLS += VBoxPython-inst-sample
 endif
 
@@ -1469,10 +1468,4 @@
 	python/server/module.py=>server/module.py \
 	python/server/policy.py=>server/policy.py
-
-# Python Client Module - a sample script.
-VBoxPython-inst-sample_INST = $(INST_SDK)bindings/xpcom/python/sample/
-VBoxPython-inst-sample_SOURCES = \
-	$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/xpcom/vboxshell.py \
-	$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/shellcommon.py
 
 #