diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build
index 3d37a7f15b..3a7c2afbd8 100755
--- a/packages/python/devel/Cheetah/build
+++ b/packages/python/devel/Cheetah/build
@@ -27,10 +27,4 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 cd $PKG_BUILD
 
-python setup.py build --cross-compile
-python setup.py install -O1 --skip-build --prefix /usr --root .install
-
-find .install -name "*.py" -exec rm -rf "{}" ";"
-find .install -name "*.pyo" -exec rm -rf "{}" ";"
-
-rm -rf .install/usr/bin
+python setup.py build --cross-compile bdist_egg --exclude-source-files
diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install
index a9c8b9924b..d2be73015e 100755
--- a/packages/python/devel/Cheetah/install
+++ b/packages/python/devel/Cheetah/install
@@ -22,4 +22,9 @@
 
 . config/options $1
 
-cp -PR $PKG_BUILD/.install/* $INSTALL
+PKG_SRC_DIR=`ls -d $PKG_BUILD`
+
+PYTHON_IMAGE_DIR="`ls -d $INSTALL/usr/lib/python*`"
+export PYTHONPATH="$PYTHON_IMAGE_DIR/site-packages"
+
+$TOOLCHAIN/bin/easy_install --exclude-scripts --zip-ok --no-deps --quiet --prefix=$INSTALL/usr $PKG_SRC_DIR/dist/*.egg