diff --git a/devel/py-turbocheetah/Makefile b/devel/py-turbocheetah/Makefile
index b5e0dd34553..76bc281a106 100644
--- a/devel/py-turbocheetah/Makefile
+++ b/devel/py-turbocheetah/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2007/12/10 21:07:51 martynas Exp $
+# $OpenBSD: Makefile,v 1.5 2008/01/13 17:21:35 martynas Exp $
 
 COMMENT=		plugin to support use of Cheetah templates
 
-V=			0.9.5
-DISTNAME=		TurboCheetah-${V}
-PKGNAME=		py-turbocheetah-${V}p0
+VERSION=		1.0
+DISTNAME=		TurboCheetah-${VERSION}
+PKGNAME=		py-turbocheetah-${VERSION}
 
 CATEGORIES=		devel
 
@@ -25,10 +25,11 @@ RUN_DEPENDS=		::devel/py-cheetah
 REGRESS_DEPENDS=	::devel/py-cheetah \
 			::devel/py-nose
 
-MAKE_ENV=		NOSE_WHERE=turbocheetah/tests
-
-REGRESS_TARGET=		nosetests
+SUBST_VARS=		VERSION
 
 MODPY_SETUPTOOLS=	Yes
 
+do-regress:
+	cd ${WRKSRC} && NOSE_WHERE=turbocheetah/tests nosetests
+
 .include <bsd.port.mk>
diff --git a/devel/py-turbocheetah/distinfo b/devel/py-turbocheetah/distinfo
index 7c67381d6ac..42320484533 100644
--- a/devel/py-turbocheetah/distinfo
+++ b/devel/py-turbocheetah/distinfo
@@ -1,5 +1,5 @@
-MD5 (TurboCheetah-0.9.5.tar.gz) = UuEhMDAqIYqOO5JURwQb5A==
-RMD160 (TurboCheetah-0.9.5.tar.gz) = UGz2VsAsGHAoOw4qTcBtSxG8vrM=
-SHA1 (TurboCheetah-0.9.5.tar.gz) = 6kgjRsU8Fb6o5BijA5FlatfUooA=
-SHA256 (TurboCheetah-0.9.5.tar.gz) = a3q3oKG9Ve+avYHfgHjDt8m5gWTLaLLRQluOsIPtyNU=
-SIZE (TurboCheetah-0.9.5.tar.gz) = 3709
+MD5 (TurboCheetah-1.0.tar.gz) = 2vmfOPZpasZLffisLgA6Aw==
+RMD160 (TurboCheetah-1.0.tar.gz) = bSJMQ3QKnQ4Tu4p2XXEN8OwWmYY=
+SHA1 (TurboCheetah-1.0.tar.gz) = 8umDwaV+AOSrv/uQYoDhR9zXh+k=
+SHA256 (TurboCheetah-1.0.tar.gz) = nkx+yw0GG/tYKBNj7hsJM3CD8BOotNA1Uyal2GaPRQw=
+SIZE (TurboCheetah-1.0.tar.gz) = 4335
diff --git a/devel/py-turbocheetah/pkg/PLIST b/devel/py-turbocheetah/pkg/PLIST
index d0b5e26d7d4..57ec86440d8 100644
--- a/devel/py-turbocheetah/pkg/PLIST
+++ b/devel/py-turbocheetah/pkg/PLIST
@@ -1,19 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/24 22:01:47 martynas Exp $
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/TurboCheetah-0.9.5-py${MODPY_VERSION}.egg-info/top_level.txt
+@comment $OpenBSD: PLIST,v 1.2 2008/01/13 17:21:35 martynas Exp $
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/TurboCheetah-${VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/turbocheetah/
 lib/python${MODPY_VERSION}/site-packages/turbocheetah/__init__.py
 lib/python${MODPY_VERSION}/site-packages/turbocheetah/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/turbocheetah/cheetahsupport.py
 lib/python${MODPY_VERSION}/site-packages/turbocheetah/cheetahsupport.pyc
-lib/python${MODPY_VERSION}/site-packages/turbocheetah/tests/
-lib/python${MODPY_VERSION}/site-packages/turbocheetah/tests/__init__.py
-lib/python${MODPY_VERSION}/site-packages/turbocheetah/tests/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/turbocheetah/tests/test_template.py
-lib/python${MODPY_VERSION}/site-packages/turbocheetah/tests/test_template.pyc