diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build
index c338b2b40d..76397f3922 100755
--- a/packages/python/devel/Cheetah/build
+++ b/packages/python/devel/Cheetah/build
@@ -4,14 +4,16 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build Python
+$SCRIPTS/build distribute
+$SCRIPTS/build distutilscross
 
-. config/options.python
+export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
+export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
 cd $PKG_BUILD
 
-$PYTHON setup.py build
-
-$PYTHON setup.py install -O1 --skip-build --prefix /usr --root .install
+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 "{}" ";"
diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install
index daa797322c..4d0a7235de 100755
--- a/packages/python/devel/Cheetah/install
+++ b/packages/python/devel/Cheetah/install
@@ -3,5 +3,6 @@
 . config/options $1
 
 $SCRIPTS/install Python
+$SCRIPTS/install distribute
 
 cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff b/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff
new file mode 100644
index 0000000000..c1819042fa
--- /dev/null
+++ b/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff
@@ -0,0 +1,23 @@
+diff -Naur Cheetah-2.0.1/SetupTools.py Cheetah-2.0.1.patch/SetupTools.py
+--- Cheetah-2.0.1/SetupTools.py	2007-11-03 20:44:38.000000000 +0100
++++ Cheetah-2.0.1.patch/SetupTools.py	2010-10-19 00:34:45.377616641 +0200
+@@ -19,18 +19,7 @@
+ import string
+ import traceback
+ 
+-from distutils.core import setup
+-if 'CHEETAH_USE_SETUPTOOLS' in os.environ:
+-    # @@TR: Please note that this is for testing purposes only!  PEAK setuptools
+-    # is not required or recommended for installing Cheetah.  Downstream
+-    # package managers (linux distros, etc.) should *not* enable this.
+-    try:
+-        # use http://peak.telecommunity.com/DevCenter/setuptools if it's installed
+-        # requires Py >=2.3
+-        from setuptools import setup
+-    except ImportError:   
+-        from distutils.core import setup
+-
++from setuptools import setup
+ from distutils.core import Command
+ from distutils.command.install_data import install_data
+