Index: /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py	(revision 20148)
+++ /trunk/src/VBox/Frontends/VBoxShell/shellcommon.py	(revision 20149)
@@ -175,10 +175,9 @@
     id = mach.id
     print "removing machine ",mach.name,"with UUID",id
-    session = mgr.getSessionObject(vb)
-    vb.openSession(session, id)
+    session = ctx['global'].openMachineSession(id)
     mach=session.machine
     for d in mach.getHardDiskAttachments():
         mach.detachHardDisk(d.controller, d.port, d.device)
-    session.close()
+    ctx['global'].closeMachineSession(session)
     mach = vb.unregisterMachine(id)
     if mach:
@@ -416,5 +415,4 @@
     if mach == None:
         return 0
-    vbox = ctx['vb']
     session = ctx['mgr'].getSessionObject(vbox)
     vbox.openSession(session, mach.id)
Index: /trunk/src/VBox/Installer/linux/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 20148)
+++ /trunk/src/VBox/Installer/linux/Makefile.kmk	(revision 20149)
@@ -193,4 +193,14 @@
 endif
 
+# Python XPCOM glue
+ifdef VBOX_WITH_PYTHON
+  VBOX_LNX_NO_STRIP += \
+	$(foreach f,$(notdir $(wildcard $(PATH_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
+	sdk/bindings/xpcom/python/xpcom/client/__init__.py \
+        sdk/installer/vboxapisetup.py \
+	sdk/installer/vboxapi/__init__.py \
+	sdk/installer/vboxapi/VirtualBox_constants.py
+endif
+
 # Headless
 ifdef VBOX_WITH_HEADLESS
@@ -343,4 +353,8 @@
 	archive/nls \
 	$(if $(VBOX_WITH_QT4_SUN),archive/accessible,) \
+	$(if $(VBOX_WITH_PYTHON),archive/sdk/installer,) \
+	$(if $(VBOX_WITH_PYTHON),archive/sdk/installer/vboxapi,) \
+	$(if $(VBOX_WITH_PYTHON),archive/sdk/bindings/xpcom/python/xpcom,) \
+	$(if $(VBOX_WITH_PYTHON),archive/sdk/bindings/xpcom/python/xpcom/client,) \
 	archive/additions \
 	install\
Index: /trunk/src/VBox/Main/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Main/Makefile.kmk	(revision 20148)
+++ /trunk/src/VBox/Main/Makefile.kmk	(revision 20149)
@@ -169,12 +169,16 @@
 VBox-main-xidl_SOURCES = $(VBOX_XIDL_FILE_SRC)
 
+ifdef VBOX_WITH_PYTHON
+
 INSTALLS += VBox-python-glue
-VBox-python-glue_INST = $(INST_SDK)bindings/
+VBox-python-glue_INST = $(INST_SDK)installer
 # This file also should go to Python site-wide modules directory
 # so for users it look 'just being here'
-VBox-python-glue_SOURCES = glue/vboxapi.py=>glue/python/vboxapi/__init__.py
-
-VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/bindings/glue/python/vboxapi/VirtualBox_constants.py
+VBox-python-glue_SOURCES = glue/vboxapi.py=>vboxapi/__init__.py
+
+VBOX_PYTHON_CONSTANTS = $(VBOX_PATH_SDK)/installer/vboxapi/VirtualBox_constants.py
 OTHERS += $(VBOX_PYTHON_CONSTANTS)
+
+endif # VBOX_WITH_PYTHON
 
 ifndef VBOX_ONLY_SDK # Note this goes on for *very* long
Index: /trunk/src/VBox/Main/glue/vboxapi.py
===================================================================
--- /trunk/src/VBox/Main/glue/vboxapi.py	(revision 20148)
+++ /trunk/src/VBox/Main/glue/vboxapi.py	(revision 20149)
@@ -28,6 +28,7 @@
 
 os.environ["VBOX_PROGRAM_PATH"] = VboxBinDir
-#os.environ["VBOX_SDK_PATH"] = VboxSdkDir
+os.environ["VBOX_SDK_PATH"] = VboxSdkDir
 sys.path.append(VboxBinDir)
+# This directory's content goes to the site-wide directory
 #sys.path.append(VboxSdkDir+"/bindings/glue/python")