diff --git a/packages/lang/Python/build b/packages/lang/Python/build
index 4f493efa3a..6a7e5dc3a6 100755
--- a/packages/lang/Python/build
+++ b/packages/lang/Python/build
@@ -27,7 +27,6 @@ PY_DISABLED_MODULES="readline _curses _curses_panel _tkinter nis gdbm bsddb"
 # dont use some optimizations because of problems
 # this fixes problems with expat (maybe)
 #  LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-#OPT="$CFLAGS -fno-strict-aliasing" \
 
 cd $PKG_BUILD
 mkdir -p .objdir-target && cd .objdir-target
@@ -83,10 +82,24 @@ make  -j1 CC="$TARGET_CC" \
       PYTHON_MODULES_LIB="$TARGET_LIBDIR" \
       install
 
-cp -R ../Lib ./
-#  $ROOT/$TOOLCHAIN/bin/python -Wi -t ./Lib/compileall.py -f -x test ./Lib
-  $ROOT/$TOOLCHAIN/bin/python -Wi -OO -t ./Lib/compileall.py -f -x test ./Lib
-
 # 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 wsgiref"
+INCLUDE_DIRS="compiler ctypes ctypes/macholib distutils distutils/command email"
+INCLUDE_DIRS="$INCLUDE_DIRS email/mime encodings hotshot importlib json logging"
+INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing plat-linux2 sqlite3 xml xml/dom xml/etree"
+INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax"
+
+mkdir ./Lib
+cp ../Lib/*.py ./Lib
+
+for dirs in $INCLUDE_DIRS; do
+  mkdir -p ./Lib/$dirs
+  cp ../Lib/$dirs/*.py ./Lib/$dirs
+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
index 4cfbea60a4..0b0bccf5d8 100755
--- a/packages/lang/Python/install
+++ b/packages/lang/Python/install
@@ -25,12 +25,6 @@
 PYTHON_VERSION=2.7
 PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION
 
-EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib wsgiref"
-INCLUDE_DIRS="compiler ctypes ctypes/macholib distutils distutils/command email"
-INCLUDE_DIRS="$INCLUDE_DIRS email/mime encodings hotshot importlib json logging"
-INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing sqlite3 xml xml/dom xml/etree"
-INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax"
-
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/.objdir-target/python $INSTALL/usr/bin/
 
@@ -46,16 +40,8 @@ mkdir -p $PYTHON_LIB_DIR/lib-dynload
   cp $PKG_BUILD/.objdir-target/build/lib*/*.so $PYTHON_LIB_DIR/lib-dynload
   cp $PKG_BUILD/.objdir-target/Modules/*.so $PYTHON_LIB_DIR/lib-dynload
 
-  cp $PKG_BUILD/.objdir-target/Lib/*.py* $PYTHON_LIB_DIR
-
-mkdir -p $PYTHON_LIB_DIR/plat-linux2
-  cp $PKG_BUILD/.objdir-target/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2
-
-for dirs in $INCLUDE_DIRS; do
-  mkdir -p $PYTHON_LIB_DIR/$dirs
-  cp $PKG_BUILD/.objdir-target/Lib/$dirs/*.py* $PYTHON_LIB_DIR/$dirs
-done
+cp -R $PKG_BUILD/.objdir-target/Lib/* $PYTHON_LIB_DIR
 
 # For future 3rd-parties Python modules
-mkdir -p $PYTHON_LIB_DIR/site-packages
+  mkdir -p $PYTHON_LIB_DIR/site-packages