diff --git a/config/functions b/config/functions
index 00fdfaa2a1..f4b6d795f5 100644
--- a/config/functions
+++ b/config/functions
@@ -131,6 +131,7 @@ reset_pkg_vars() {
   PKG_LICENSE="unknown"
   PKG_AUTORECONF="no"
   PKG_IS_ADDON="no"
+  PKG_PYTHON_VERSION="python2.7"
 }
 
 kernel_path() {
diff --git a/packages/lang/Python/package.mk b/packages/lang/Python2/package.mk
similarity index 82%
rename from packages/lang/Python/package.mk
rename to packages/lang/Python2/package.mk
index 16b9f075f2..09f9326ed4 100644
--- a/packages/lang/Python/package.mk
+++ b/packages/lang/Python2/package.mk
@@ -16,23 +16,23 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="Python"
+PKG_NAME="Python2"
 PKG_VERSION="2.7.13"
 PKG_SHA256="35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731"
 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_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz"
+PKG_SOURCE_DIR="${PKG_NAME::-1}-$PKG_VERSION*"
 PKG_DEPENDS_HOST="zlib:host bzip2:host sqlite:host"
-PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl libffi Python:host"
+PKG_DEPENDS_TARGET="toolchain sqlite expat zlib bzip2 openssl libffi Python2:host"
 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_SHORTDESC="python2: The Python2 programming language"
+PKG_LONGDESC="Python2 is an interpreted object-oriented programming language, and is often compared with Tcl, Perl, Java or Scheme."
 
-PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
-PY_DISABLED_MODULES="_tkinter nis gdbm bsddb ossaudiodev"
+PKG_PY_DISABLED_MODULES="_tkinter nis gdbm bsddb ossaudiodev"
 
 PKG_CONFIGURE_OPTS_HOST="--cache-file=config.cache \
                          --without-cxx-main \
@@ -74,7 +74,7 @@ post_patch() {
 make_host() {
   make PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
        PYTHON_MODULES_LIB="$HOST_LIBDIR" \
-       PYTHON_DISABLE_MODULES="readline _curses _curses_panel $PY_DISABLED_MODULES"
+       PYTHON_DISABLE_MODULES="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES"
 
   # python distutils per default adds -L$LIBDIR when linking binary extensions
     sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(cat pybuilddir.txt)/_sysconfigdata.py
@@ -83,7 +83,7 @@ make_host() {
 makeinstall_host() {
   make -j1 PYTHON_MODULES_INCLUDE="$HOST_INCDIR" \
        PYTHON_MODULES_LIB="$HOST_LIBDIR" \
-       PYTHON_DISABLE_MODULES="readline _curses _curses_panel $PY_DISABLED_MODULES" \
+       PYTHON_DISABLE_MODULES="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES" \
        install
 }
 
@@ -93,28 +93,27 @@ pre_configure_target() {
 
 make_target() {
   make  -j1 CC="$CC" LDFLAGS="$TARGET_LDFLAGS -L." \
-        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        PYTHON_DISABLE_MODULES="$PKG_PY_DISABLED_MODULES" \
         PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
         PYTHON_MODULES_LIB="$TARGET_LIBDIR"
 }
 
 makeinstall_target() {
   make  -j1 CC="$CC" DESTDIR=$SYSROOT_PREFIX \
-        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        PYTHON_DISABLE_MODULES="$PKG_PY_DISABLED_MODULES" \
         PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
         PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
         install
 
   make  -j1 CC="$CC" DESTDIR=$INSTALL \
-        PYTHON_DISABLE_MODULES="$PY_DISABLED_MODULES" \
+        PYTHON_DISABLE_MODULES="$PKG_PY_DISABLED_MODULES" \
         PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" \
         PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
         install
 }
 
 post_makeinstall_target() {
-  EXCLUDE_DIRS="bsddb idlelib lib-tk lib2to3 msilib pydoc_data test unittest"
-  for dir in $EXCLUDE_DIRS; do
+  for dir in bsddb idlelib lib-tk lib2to3 msilib pydoc_data test unittest; do
     rm -rf $INSTALL/usr/lib/python*/$dir
   done
 
@@ -125,9 +124,9 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/smtpd.py
   rm -rf $INSTALL/usr/bin/python*-config
 
-  cd $INSTALL/usr/lib/python2.7
-  python -Wi -t -B $PKG_BUILD/Lib/compileall.py -d /usr/lib/python2.7 -f .
-  find $INSTALL/usr/lib/python2.7 -name "*.py" -exec rm -f {} \; &>/dev/null
+  cd $INSTALL/usr/lib/$PKG_PYTHON_VERSION
+  $TOOLCHAIN/bin/python -Wi -t -B $PKG_BUILD/Lib/compileall.py -d /usr/lib/$PKG_PYTHON_VERSION -f .
+  find $INSTALL/usr/lib/$PKG_PYTHON_VERSION -name "*.py" -exec rm -f {} \; &>/dev/null
 
   # strip
   chmod u+w $INSTALL/usr/lib/libpython*.so.*
diff --git a/packages/lang/Python/patches/Python-2.7.11-001_xcompile.patch b/packages/lang/Python2/patches/Python2-2.7.11-001_xcompile.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-001_xcompile.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-001_xcompile.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-002_xcompile_path.patch b/packages/lang/Python2/patches/Python2-2.7.11-002_xcompile_path.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-002_xcompile_path.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-002_xcompile_path.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-003_xcompile_disable_modules.patch b/packages/lang/Python2/patches/Python2-2.7.11-003_xcompile_disable_modules.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-003_xcompile_disable_modules.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-003_xcompile_disable_modules.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-004_xcompile_fix_libffi_configure.patch b/packages/lang/Python2/patches/Python2-2.7.11-004_xcompile_fix_libffi_configure.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-004_xcompile_fix_libffi_configure.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-004_xcompile_fix_libffi_configure.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-005_dont_generate_pyo_and_pyc_files.patch b/packages/lang/Python2/patches/Python2-2.7.11-005_dont_generate_pyo_and_pyc_files.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-005_dont_generate_pyo_and_pyc_files.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-005_dont_generate_pyo_and_pyc_files.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-006_fix_ncurse_cppflags.patch b/packages/lang/Python2/patches/Python2-2.7.11-006_fix_ncurse_cppflags.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-006_fix_ncurse_cppflags.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-006_fix_ncurse_cppflags.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-008-distutils-use-python-sysroot.patch b/packages/lang/Python2/patches/Python2-2.7.11-008-distutils-use-python-sysroot.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-008-distutils-use-python-sysroot.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-008-distutils-use-python-sysroot.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-008-reread-environment.patch b/packages/lang/Python2/patches/Python2-2.7.11-008-reread-environment.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-008-reread-environment.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-008-reread-environment.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-009-distutils-rpath.patch b/packages/lang/Python2/patches/Python2-2.7.11-009-distutils-rpath.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-009-distutils-rpath.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-009-distutils-rpath.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-010-fix-python-config.patch b/packages/lang/Python2/patches/Python2-2.7.11-010-fix-python-config.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-010-fix-python-config.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-010-fix-python-config.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-014-abort-on-failed-modules.patch b/packages/lang/Python2/patches/Python2-2.7.11-014-abort-on-failed-modules.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-014-abort-on-failed-modules.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-014-abort-on-failed-modules.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-015_no_static_lib.patch b/packages/lang/Python2/patches/Python2-2.7.11-015_no_static_lib.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-015_no_static_lib.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-015_no_static_lib.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-016-default-is-optimized.patch b/packages/lang/Python2/patches/Python2-2.7.11-016-default-is-optimized.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-016-default-is-optimized.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-016-default-is-optimized.patch
diff --git a/packages/lang/Python/patches/Python-2.7.11-017-getentropy-linux.patch b/packages/lang/Python2/patches/Python2-2.7.11-017-getentropy-linux.patch
similarity index 100%
rename from packages/lang/Python/patches/Python-2.7.11-017-getentropy-linux.patch
rename to packages/lang/Python2/patches/Python2-2.7.11-017-getentropy-linux.patch