diff --git a/packages/python/devel/Cheetah/build b/packages/python/devel/Cheetah/build
index 76397f3922..ad41cf4261 100755
--- a/packages/python/devel/Cheetah/build
+++ b/packages/python/devel/Cheetah/build
@@ -2,11 +2,6 @@
 
 . config/options $1
 
-$SCRIPTS/build toolchain
-$SCRIPTS/build Python
-$SCRIPTS/build distribute
-$SCRIPTS/build distutilscross
-
 export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
 export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
 
diff --git a/packages/python/devel/Cheetah/install b/packages/python/devel/Cheetah/install
index 4d0a7235de..73886a0890 100755
--- a/packages/python/devel/Cheetah/install
+++ b/packages/python/devel/Cheetah/install
@@ -2,7 +2,4 @@
 
 . config/options $1
 
-$SCRIPTS/install Python
-$SCRIPTS/install distribute
-
 cp -PR $PKG_BUILD/.install/* $INSTALL
diff --git a/packages/python/devel/Cheetah/meta b/packages/python/devel/Cheetah/meta
new file mode 100644
index 0000000000..bdf06a5768
--- /dev/null
+++ b/packages/python/devel/Cheetah/meta
@@ -0,0 +1,14 @@
+PKG_NAME="Cheetah"
+PKG_VERSION="2.4.2.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.cheetahtemplate.org/"
+PKG_URL="http://pypi.python.org/packages/source/C/Cheetah/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS="Python distribute"
+PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/devel"
+PKG_SHORTDESC="cheetah: Python-powered template engine and code generator"
+PKG_LONGDESC="Cheetah is a Python-powered template engine and code generator. It can be used as a standalone utility or it can be combined with other tools. Cheetah has many potential uses, but web developers looking for a viable alternative to ASP, JSP, PHP and PSP are expected to be its principle user group."
+PKG_IS_ADDON="no"
diff --git a/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff b/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff
deleted file mode 100644
index c1819042fa..0000000000
--- a/packages/python/devel/Cheetah/patches/Cheetah-setuptools.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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
- 
diff --git a/packages/python/devel/Cheetah/url b/packages/python/devel/Cheetah/url
deleted file mode 100644
index 73f6cf2f46..0000000000
--- a/packages/python/devel/Cheetah/url
+++ /dev/null
@@ -1 +0,0 @@
-http://mesh.dl.sourceforge.net/sourceforge/cheetahtemplate/Cheetah-2.0.1.tar.gz