diff --git a/devel/py-cheetah/DESCR b/devel/py-cheetah/DESCR
new file mode 100644
index 000000000000..80c3d3628e72
--- /dev/null
+++ b/devel/py-cheetah/DESCR
@@ -0,0 +1,2 @@
+Cheetah is a Python-powered template engine and code-generator.
+It is similar to the Jakarta project's Velocity.
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
new file mode 100644
index 000000000000..1f93cd2f277d
--- /dev/null
+++ b/devel/py-cheetah/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/01/29 15:59:12 shannonjr Exp $
+#
+
+DISTNAME=		Cheetah-0.9.18
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cheetahtemplate/}
+
+MAINTAINER=		shannonjr@NetBSD.org
+HOMEPAGE=		http://cheetahtemplate.sourceforge.net/
+COMMENT=		Python-powered template engine and code-generator
+
+PYDISTUTILSPKG=		yes
+PYBINMODULE=		yes
+PYSETUP=		setup.py
+
+.include "../../lang/python/extension.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-cheetah/PLIST b/devel/py-cheetah/PLIST
new file mode 100644
index 000000000000..b832a068e629
--- /dev/null
+++ b/devel/py-cheetah/PLIST
@@ -0,0 +1,96 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/29 15:59:12 shannonjr Exp $
+bin/cheetah
+bin/cheetah-compile
+${PYSITELIB}/Cheetah/CacheRegion.pyc
+${PYSITELIB}/Cheetah/CacheRegion.pyo
+${PYSITELIB}/Cheetah/CheetahWrapper.pyc
+${PYSITELIB}/Cheetah/CheetahWrapper.pyo
+${PYSITELIB}/Cheetah/Compiler.pyc
+${PYSITELIB}/Cheetah/Compiler.pyo
+${PYSITELIB}/Cheetah/DummyTransaction.pyc
+${PYSITELIB}/Cheetah/DummyTransaction.pyo
+${PYSITELIB}/Cheetah/ErrorCatchers.pyc
+${PYSITELIB}/Cheetah/ErrorCatchers.pyo
+${PYSITELIB}/Cheetah/FileUtils.pyc
+${PYSITELIB}/Cheetah/FileUtils.pyo
+${PYSITELIB}/Cheetah/Filters.pyc
+${PYSITELIB}/Cheetah/Filters.pyo
+${PYSITELIB}/Cheetah/ImportHooks.pyc
+${PYSITELIB}/Cheetah/ImportHooks.pyo
+${PYSITELIB}/Cheetah/ImportManager.pyc
+${PYSITELIB}/Cheetah/ImportManager.pyo
+${PYSITELIB}/Cheetah/NameMapper.pyc
+${PYSITELIB}/Cheetah/NameMapper.pyo
+${PYSITELIB}/Cheetah/Parser.pyc
+${PYSITELIB}/Cheetah/Parser.pyo
+${PYSITELIB}/Cheetah/Servlet.pyc
+${PYSITELIB}/Cheetah/Servlet.pyo
+${PYSITELIB}/Cheetah/SettingsManager.pyc
+${PYSITELIB}/Cheetah/SettingsManager.pyo
+${PYSITELIB}/Cheetah/SourceReader.pyc
+${PYSITELIB}/Cheetah/SourceReader.pyo
+${PYSITELIB}/Cheetah/Template.pyc
+${PYSITELIB}/Cheetah/Template.pyo
+${PYSITELIB}/Cheetah/TemplateCmdLineIface.pyc
+${PYSITELIB}/Cheetah/TemplateCmdLineIface.pyo
+${PYSITELIB}/Cheetah/Templates/SkeletonPage.pyc
+${PYSITELIB}/Cheetah/Templates/SkeletonPage.pyo
+${PYSITELIB}/Cheetah/Templates/_SkeletonPage.pyc
+${PYSITELIB}/Cheetah/Templates/_SkeletonPage.pyo
+${PYSITELIB}/Cheetah/Templates/__init__.pyc
+${PYSITELIB}/Cheetah/Templates/__init__.pyo
+${PYSITELIB}/Cheetah/Tests/CheetahWrapper.pyc
+${PYSITELIB}/Cheetah/Tests/CheetahWrapper.pyo
+${PYSITELIB}/Cheetah/Tests/FileRefresh.pyc
+${PYSITELIB}/Cheetah/Tests/FileRefresh.pyo
+${PYSITELIB}/Cheetah/Tests/NameMapper.pyc
+${PYSITELIB}/Cheetah/Tests/NameMapper.pyo
+${PYSITELIB}/Cheetah/Tests/SyntaxAndOutput.pyc
+${PYSITELIB}/Cheetah/Tests/SyntaxAndOutput.pyo
+${PYSITELIB}/Cheetah/Tests/Template.pyc
+${PYSITELIB}/Cheetah/Tests/Template.pyo
+${PYSITELIB}/Cheetah/Tests/Test.pyc
+${PYSITELIB}/Cheetah/Tests/Test.pyo
+${PYSITELIB}/Cheetah/Tests/__init__.pyc
+${PYSITELIB}/Cheetah/Tests/__init__.pyo
+${PYSITELIB}/Cheetah/Tests/unittest_local_copy.pyc
+${PYSITELIB}/Cheetah/Tests/unittest_local_copy.pyo
+${PYSITELIB}/Cheetah/Tools/CGITemplate.pyc
+${PYSITELIB}/Cheetah/Tools/CGITemplate.pyo
+${PYSITELIB}/Cheetah/Tools/MondoReport.pyc
+${PYSITELIB}/Cheetah/Tools/MondoReport.pyo
+${PYSITELIB}/Cheetah/Tools/RecursiveNull.pyc
+${PYSITELIB}/Cheetah/Tools/RecursiveNull.pyo
+${PYSITELIB}/Cheetah/Tools/SiteHierarchy.pyc
+${PYSITELIB}/Cheetah/Tools/SiteHierarchy.pyo
+${PYSITELIB}/Cheetah/Tools/__init__.pyc
+${PYSITELIB}/Cheetah/Tools/__init__.pyo
+${PYSITELIB}/Cheetah/Utils/Indenter.pyc
+${PYSITELIB}/Cheetah/Utils/Indenter.pyo
+${PYSITELIB}/Cheetah/Utils/Misc.pyc
+${PYSITELIB}/Cheetah/Utils/Misc.pyo
+${PYSITELIB}/Cheetah/Utils/VerifyType.pyc
+${PYSITELIB}/Cheetah/Utils/VerifyType.pyo
+${PYSITELIB}/Cheetah/Utils/WebInputMixin.pyc
+${PYSITELIB}/Cheetah/Utils/WebInputMixin.pyo
+${PYSITELIB}/Cheetah/Utils/__init__.pyc
+${PYSITELIB}/Cheetah/Utils/__init__.pyo
+${PYSITELIB}/Cheetah/Utils/optik/__init__.pyc
+${PYSITELIB}/Cheetah/Utils/optik/__init__.pyo
+${PYSITELIB}/Cheetah/Utils/optik/errors.pyc
+${PYSITELIB}/Cheetah/Utils/optik/errors.pyo
+${PYSITELIB}/Cheetah/Utils/optik/option.pyc
+${PYSITELIB}/Cheetah/Utils/optik/option.pyo
+${PYSITELIB}/Cheetah/Utils/optik/option_parser.pyc
+${PYSITELIB}/Cheetah/Utils/optik/option_parser.pyo
+${PYSITELIB}/Cheetah/Version.pyc
+${PYSITELIB}/Cheetah/Version.pyo
+${PYSITELIB}/Cheetah/__init__.pyc
+${PYSITELIB}/Cheetah/__init__.pyo
+${PYSITELIB}/Cheetah/_namemapper.so
+@dirrm ${PYSITELIB}/Cheetah/Utils/optik
+@dirrm ${PYSITELIB}/Cheetah/Utils
+@dirrm ${PYSITELIB}/Cheetah/Tools
+@dirrm ${PYSITELIB}/Cheetah/Tests
+@dirrm ${PYSITELIB}/Cheetah/Templates
+@dirrm ${PYSITELIB}/Cheetah
diff --git a/devel/py-cheetah/distinfo b/devel/py-cheetah/distinfo
new file mode 100644
index 000000000000..7ff3b328615a
--- /dev/null
+++ b/devel/py-cheetah/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/01/29 15:59:12 shannonjr Exp $
+
+SHA1 (Cheetah-0.9.18.tar.gz) = be3d1ee3549788d3004eeb8a82cec38c14020390
+RMD160 (Cheetah-0.9.18.tar.gz) = 03d46c26beecfcd11e9b7ea2f1b8caf9636f9c78
+Size (Cheetah-0.9.18.tar.gz) = 147525 bytes