diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk
index b19201f292..a7df1658cf 100644
--- a/packages/devel/boost/package.mk
+++ b/packages/devel/boost/package.mk
@@ -27,7 +27,7 @@ PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
 PKG_DEPENDS_HOST=""
 PKG_DEPENDS_TARGET="zlib bzip2"
 PKG_BUILD_DEPENDS_HOST="toolchain"
-PKG_BUILD_DEPENDS_TARGET="toolchain boost:host Python-host zlib bzip2"
+PKG_BUILD_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="boost: Peer-reviewed STL style libraries for C++"
diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk
index 80e75efb84..4419edb08d 100644
--- a/packages/devel/glib/package.mk
+++ b/packages/devel/glib/package.mk
@@ -24,8 +24,8 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="zlib libffi"
-PKG_BUILD_DEPENDS_HOST="ccache:host libffi:host libxml2:host zlib:host Python-host"
-PKG_BUILD_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python-host"
+PKG_BUILD_DEPENDS_HOST="ccache:host libffi:host libxml2:host zlib:host Python:host"
+PKG_BUILD_DEPENDS_TARGET="toolchain zlib libffi pcre glib:host Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="glib: C support library"
diff --git a/packages/devel/scons/package.mk b/packages/devel/scons/package.mk
index 666bb2c5aa..5841bf13fc 100644
--- a/packages/devel/scons/package.mk
+++ b/packages/devel/scons/package.mk
@@ -23,8 +23,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.scons.org/"
 PKG_URL="$SOURCEFORGE_SRC/scons/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="Python-host"
-PKG_BUILD_DEPENDS="Python-host"
+PKG_DEPENDS="Python:host"
+PKG_BUILD_DEPENDS="Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="python/devel"
 PKG_SHORTDESC="SCons: an Open Source software construction tool—that is, a next-generation build tool."
diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk
index ea402b69e2..de873ddedd 100644
--- a/packages/graphics/Mesa/package.mk
+++ b/packages/graphics/Mesa/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11 systemd"
-PKG_BUILD_DEPENDS_TARGET="toolchain Python-host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd"
+PKG_BUILD_DEPENDS_TARGET="toolchain Python:host makedepend:host libxml2:host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
 PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
diff --git a/packages/lang/Python/build b/packages/lang/Python/build
deleted file mode 100755
index 191c978b29..0000000000
--- a/packages/lang/Python/build
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb"
-
-cd $PKG_BUILD
-mkdir -p .objdir-target && cd .objdir-target
-
-ac_cv_file_dev_ptc=no \
-ac_cv_file_dev_ptmx=yes \
-ac_cv_func_lchflags_works=no \
-ac_cv_func_chflags_works=no \
-ac_cv_func_printf_zd=yes \
-ac_cv_buggy_getaddrinfo=no \
-ac_cv_header_bluetooth_bluetooth_h=no \
-ac_cv_header_bluetooth_h=no \
-../configure --host=$TARGET_NAME \
-             --build=$HOST_NAME \
-             --prefix=/usr \
-             --sysconfdir=/etc \
-             --enable-shared \
-             --with-threads \
-             --enable-unicode=ucs4 \
-             --enable-ipv6 \
-             --disable-profiling \
-             --without-pydebug \
-             --without-doc-strings \
-             --without-tsc \
-             --with-pymalloc \
-             --without-fpectl \
-             --with-wctype-functions \
-             --without-cxx-main \
-             --with-system-ffi \
-             --with-system-expat \
-
-make  -j1 CC="$TARGET_CC" \
-      HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
-      HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
-      BLDSHARED="$CC -shared" \
-      RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \
-      PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
-      CROSS_COMPILE="$TARGET_NAME" \
-      CROSS_COMPILE_TARGET="yes" \
-      PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
-      PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
-
-make  -j1 CC="$TARGET_CC" \
-      DESTDIR=$SYSROOT_PREFIX \
-      HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
-      HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
-      BLDSHARED="$CC -shared" \
-      RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \
-      PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
-      CROSS_COMPILE="$TARGET_NAME" \
-      CROSS_COMPILE_TARGET="yes" \
-      PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
-      PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
-      install
-
-# python distutils per default adds -L$LIBDIR when linking binary extensions
-sed -e "s|^LIBDIR=.*|LIBDIR= $SYSROOT_PREFIX/usr/lib|" \
-    -i $SYSROOT_PREFIX/usr/lib/python*/config/Makefile
-
-EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib"
-INCLUDE_DIRS="compiler ctypes distutils email"
-INCLUDE_DIRS="$INCLUDE_DIRS encodings hotshot importlib json logging"
-INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing plat-linux2 sqlite3 xml"
-INCLUDE_DIRS="$INCLUDE_DIRS wsgiref"
-
-mkdir -p ./Lib
-cp ../Lib/*.py ./Lib
-
-for dir in $INCLUDE_DIRS; do
-  cp -a ../Lib/$dir ./Lib/
-done
-
-python -Wi -t -B ../Lib/compileall.py ./Lib -f
-
-rm -rf `find ./Lib -name "*.py"`
diff --git a/packages/lang/Python/install b/packages/lang/Python/install
deleted file mode 100755
index 89c1f9f152..0000000000
--- a/packages/lang/Python/install
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-PYTHON_VERSION=2.7
-PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION
-
-mkdir -p $INSTALL/usr/bin
-  cp $PKG_BUILD/.objdir-target/python $INSTALL/usr/bin/
-
-mkdir -p $INSTALL/usr/lib
-  cp -PR $PKG_BUILD/.objdir-target/libpython2.7.so.1.0 $INSTALL/usr/lib/
-  ln -sf libpython2.7.so.1.0 $INSTALL/usr/lib/libpython2.7.so
-
-mkdir -p $PYTHON_LIB_DIR/config
-  cp $PKG_BUILD/.objdir-target/Makefile $PYTHON_LIB_DIR/config
-  cp $PKG_BUILD/.objdir-target/pyconfig.h $PYTHON_LIB_DIR/config
-
-mkdir -p $PYTHON_LIB_DIR/lib-dynload
-  cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload
-
-# Todo: sometimes Python dont build '_socket.so' for some reasons and continues without failing,
-# let it fail in this way, to be sure '_socket.so' will be installed-  a rebuild of Python fixes
-# the issue in most cases:
-  cp $PKG_BUILD/.objdir-target/build/lib*/_socket.so $PYTHON_LIB_DIR/lib-dynload
-
-cp -R $PKG_BUILD/.objdir-target/Lib/* $PYTHON_LIB_DIR
-
-# For future 3rd-parties Python modules
-  mkdir -p $PYTHON_LIB_DIR/site-packages
-
diff --git a/packages/lang/Python/meta b/packages/lang/Python/meta
deleted file mode 100644
index 56dede66ea..0000000000
--- a/packages/lang/Python/meta
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="Python"
-PKG_VERSION="2.7.3"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.python.org/"
-PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="expat zlib bzip2 openssl libffi file"
-PKG_BUILD_DEPENDS="toolchain Python-host sqlite expat zlib bzip2 openssl libffi"
-PKG_PRIORITY="optional"
-PKG_SECTION="lang"
-PKG_SHORTDESC="python: The Python programming language"
-PKG_LONGDESC="Python is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
-
-PKG_IS_ADDON="no"
-PKG_AUTORECONF="no"
diff --git a/packages/lang/Python/package.mk b/packages/lang/Python/package.mk
new file mode 100644
index 0000000000..f2912eb4d2
--- /dev/null
+++ b/packages/lang/Python/package.mk
@@ -0,0 +1,163 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="Python"
+PKG_VERSION="2.7.3"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.python.org/"
+PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_HOST=""
+PKG_DEPENDS_TARGET="expat zlib bzip2 openssl libffi file"
+PKG_BUILD_DEPENDS_HOST="ccache:host zlib:host expat:host"
+PKG_BUILD_DEPENDS_TARGET="toolchain Python:host sqlite expat zlib bzip2 openssl libffi"
+PKG_PRIORITY="optional"
+PKG_SECTION="lang"
+PKG_SHORTDESC="python: The Python programming language"
+PKG_LONGDESC="Python is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb"
+
+PKG_CONFIGURE_OPTS_HOST="--cache-file=config.cache \
+                         --without-cxx-main \
+                         --with-threads \
+                         --enable-unicode=ucs4 \
+                         --with-system-expat"
+
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_file_dev_ptc=no \
+                           ac_cv_file_dev_ptmx=yes \
+                           ac_cv_func_lchflags_works=no \
+                           ac_cv_func_chflags_works=no \
+                           ac_cv_func_printf_zd=yes \
+                           ac_cv_buggy_getaddrinfo=no \
+                           ac_cv_header_bluetooth_bluetooth_h=no \
+                           ac_cv_header_bluetooth_h=no \
+                           --with-threads \
+                           --enable-unicode=ucs4 \
+                           --enable-ipv6 \
+                           --disable-profiling \
+                           --without-pydebug \
+                           --without-doc-strings \
+                           --without-tsc \
+                           --with-pymalloc \
+                           --without-fpectl \
+                           --with-wctype-functions \
+                           --without-cxx-main \
+                           --with-system-ffi \
+                           --with-system-expat"
+
+pre_configure_host() {
+  export OPT="$HOST_CFLAGS"
+  export LDFLAGS="$LDFLAGS -lexpat"
+}
+
+make_host() {
+  make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
+       PYTHON_MODULES_LIB="$HOST_LIBDIR" \
+       PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES"
+}
+
+make_target() {
+  make  -j1 CC="$TARGET_CC" \
+        HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
+        HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
+        BLDSHARED="$CC -shared" \
+        RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \
+        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        CROSS_COMPILE="$TARGET_NAME" \
+        CROSS_COMPILE_TARGET="yes" \
+        PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
+        PYTHON_MODULES_LIB="$TARGET_LIBDIR"
+}
+
+makeinstall_host() {
+  make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
+       PYTHON_MODULES_LIB="$HOST_LIBDIR" \
+       PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+       install
+
+  cp Parser/pgen $ROOT/$TOOLCHAIN/bin
+
+# replace python-config to make sure python uses $SYSROOT_PREFIX
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
+
+    sed -e "s:%PREFIX%:$SYSROOT_PREFIX/usr:g" -e "s:%CFLAGS%:$TARGET_CFLAGS:g" \
+      $PKG_DIR/scripts/python-config > $ROOT/$TOOLCHAIN/bin/python2.7-config
+    chmod +x $ROOT/$TOOLCHAIN/bin/python2.7-config
+    ln -s python2.7-config $ROOT/$TOOLCHAIN/bin/python-config
+}
+
+makeinstall_target() {
+  make  -j1 CC="$TARGET_CC" \
+        DESTDIR=$SYSROOT_PREFIX \
+        HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
+        HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
+        BLDSHARED="$CC -shared" \
+        RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \
+        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        CROSS_COMPILE="$TARGET_NAME" \
+        CROSS_COMPILE_TARGET="yes" \
+        PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
+        PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
+        install
+
+# python distutils per default adds -L$LIBDIR when linking binary extensions
+  sed -e "s|^LIBDIR=.*|LIBDIR= $SYSROOT_PREFIX/usr/lib|" \
+      -i $SYSROOT_PREFIX/usr/lib/python*/config/Makefile
+
+  make  -j1 CC="$TARGET_CC" \
+        DESTDIR=$INSTALL \
+        HOSTPYTHON=$ROOT/$TOOLCHAIN/bin/python \
+        HOSTPGEN=$ROOT/$TOOLCHAIN/bin/pgen \
+        BLDSHARED="$CC -shared" \
+        RUNSHARED="LD_LIBRARY_PATH=$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH" \
+        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        CROSS_COMPILE="$TARGET_NAME" \
+        CROSS_COMPILE_TARGET="yes" \
+        PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
+        PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
+        install
+}
+
+post_makeinstall_target() {
+  EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib pydoc_data test unittest"
+  for dir in $EXCLUDE_DIRS; do
+    rm -rf $INSTALL/usr/lib/python*/$dir
+  done
+
+  python -Wi -t -B ../Lib/compileall.py $INSTALL/usr/lib/python*/ -f
+  rm -rf `find $INSTALL/usr/lib/python*/ -name "*.py"`
+
+  rm -rf $INSTALL/usr/lib/python*/config/Setup*
+  rm -rf $INSTALL/usr/lib/python*/config/config.*
+  rm -rf $INSTALL/usr/lib/python*/config/install-sh
+  rm -rf $INSTALL/usr/lib/python*/config/makesetup
+  rm -rf $INSTALL/usr/lib/python*/config/python.o
+
+  if [ ! -f $INSTALL/usr/lib/python*/lib-dynload/_socket.so ]; then
+    echo "sometimes Python dont build '_socket.so' for some reasons and continues without failing,"
+    echo "let it fail here, to be sure '_socket.so' will be installed. A rebuild of Python fixes"
+    echo "the issue in most cases"
+    exit 1
+  fi
+}
diff --git a/packages/toolchain/lang/Python-host/scripts/python-config b/packages/lang/Python/scripts/python-config
similarity index 100%
rename from packages/toolchain/lang/Python-host/scripts/python-config
rename to packages/lang/Python/scripts/python-config
diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk
index 7cbda313f4..4b77980db2 100644
--- a/packages/textproc/libxml2/package.mk
+++ b/packages/textproc/libxml2/package.mk
@@ -25,7 +25,7 @@ PKG_SITE="http://xmlsoft.org"
 PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="zlib"
 PKG_BUILD_DEPENDS_TARGET="toolchain zlib"
-PKG_BUILD_DEPENDS_HOST="toolchain zlib:host Python-host"
+PKG_BUILD_DEPENDS_HOST="toolchain zlib:host Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="textproc"
 PKG_SHORTDESC="libxml: XML parser library for Gnome"
diff --git a/packages/toolchain/lang/Python-host/build b/packages/toolchain/lang/Python-host/build
deleted file mode 100755
index 69febf989d..0000000000
--- a/packages/toolchain/lang/Python-host/build
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack Python
-
-setup_toolchain host
-
-PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-
-cd $BUILD/Python-*
-mkdir -p .objdir-host && cd .objdir-host
-
-OPT="$HOST_CFLAGS" \
-LDFLAGS="$LDFLAGS -lexpat" \
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --cache-file=config.cache \
-             --enable-shared \
-             --without-cxx-main \
-             --with-threads \
-             --enable-unicode=ucs4 \
-             --with-system-expat \
-
-make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
-     PYTHON_MODULES_LIB="$HOST_LIBDIR" \
-     PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
-
-make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
-     PYTHON_MODULES_LIB="$HOST_LIBDIR" \
-     PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
-     install
-
-cp Parser/pgen $ROOT/$TOOLCHAIN/bin
-
-# replace python-config to make sure python uses $SYSROOT_PREFIX
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-  rm -rf $ROOT/$TOOLCHAIN/bin/python*-config
-
-  sed -e "s:%PREFIX%:$SYSROOT_PREFIX/usr:g" -e "s:%CFLAGS%:$TARGET_CFLAGS:g" \
-    $PKG_DIR/scripts/python-config > $ROOT/$TOOLCHAIN/bin/python2.7-config
-  chmod +x $ROOT/$TOOLCHAIN/bin/python2.7-config
-  ln -s python2.7-config $ROOT/$TOOLCHAIN/bin/python-config
diff --git a/packages/toolchain/lang/Python-host/meta b/packages/toolchain/lang/Python-host/meta
deleted file mode 100644
index 37319ab974..0000000000
--- a/packages/toolchain/lang/Python-host/meta
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="Python-host"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.python.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host zlib:host expat:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="lang"
-PKG_SHORTDESC="python: The Python programming language"
-PKG_LONGDESC="Python is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk
index cb0bdf60d5..f205f06d4a 100644
--- a/packages/x11/lib/libxcb/package.mk
+++ b/packages/x11/lib/libxcb/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://xcb.freedesktop.org"
 PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS_TARGET="toolchain util-macros Python-host xcb-proto libpthread-stubs libXau"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros Python:host xcb-proto libpthread-stubs libXau"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxcb: X C-language Bindings library"
diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk
index 9a77d0fbd8..7c95bd3d51 100644
--- a/packages/x11/proto/xcb-proto/package.mk
+++ b/packages/x11/proto/xcb-proto/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS_TARGET="toolchain util-macros Python-host"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros Python:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/proto"
 PKG_SHORTDESC="xcb-proto: X C-language Bindings protocol headers"