diff --git a/databases/py-storm/Makefile b/databases/py-storm/Makefile
index f60e9188163..7bf92cc8446 100644
--- a/databases/py-storm/Makefile
+++ b/databases/py-storm/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.2 2008/01/06 17:09:35 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2008/08/28 16:53:41 wcmaier Exp $
 
 COMMENT=		generic object relational mapper for Python
 
-V=			0.11
-DISTNAME=		storm-$V
-PKGNAME=		py-${DISTNAME}p0
+MODPY_EGG_VERSION=	0.12
+DISTNAME=		storm-${MODPY_EGG_VERSION}
+PKGNAME=		py-${DISTNAME}
 
 CATEGORIES=		databases
 
 HOMEPAGE=		https://storm.canonical.com/
 
-MAINTAINER=		Will Maier <willmaier@ml1.net>
+MAINTAINER=		Will Maier <wcmaier@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		https://launchpad.net/storm/trunk/$V/+download/
+MASTER_SITES=		https://launchpad.net/storm/trunk/${MODPY_EGG_VERSION}/+download/
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		lang/python
diff --git a/databases/py-storm/distinfo b/databases/py-storm/distinfo
index 8bd61b18194..33309aacbf8 100644
--- a/databases/py-storm/distinfo
+++ b/databases/py-storm/distinfo
@@ -1,5 +1,5 @@
-MD5 (storm-0.11.tar.bz2) = NIzcOw2Fe9e1+FJOgzfETA==
-RMD160 (storm-0.11.tar.bz2) = bf3QQnqw2k23LRIB5zxM1Oq6jAY=
-SHA1 (storm-0.11.tar.bz2) = /72+XiIV7tsrTO1xh35fazVblnM=
-SHA256 (storm-0.11.tar.bz2) = VLy/Ol5Iu2S3Y1TQN/BywZOZPGgF+XyWia/Mq9bxZ7k=
-SIZE (storm-0.11.tar.bz2) = 109802
+MD5 (storm-0.12.tar.bz2) = l2ozLa3SFGEsNZ32M2D8UQ==
+RMD160 (storm-0.12.tar.bz2) = HqbLVbh886Lu1vBQnQXXo/vkC5I=
+SHA1 (storm-0.12.tar.bz2) = Ac0gND1aCPuKnXgyLFk0S1Tvz4k=
+SHA256 (storm-0.12.tar.bz2) = S7kU7bTo+xTvKVXUapquPgsq10J5e9asP4RSDQblLLw=
+SIZE (storm-0.12.tar.bz2) = 120008
diff --git a/databases/py-storm/pkg/PLIST b/databases/py-storm/pkg/PLIST
index 9175aa67083..13494b28b62 100644
--- a/databases/py-storm/pkg/PLIST
+++ b/databases/py-storm/pkg/PLIST
@@ -1,16 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/01/06 17:09:36 merdely Exp $
+@comment $OpenBSD: PLIST,v 1.3 2008/08/28 16:53:41 wcmaier Exp $
 %%SHARED%%
 lib/python${MODPY_VERSION}/site-packages/storm/
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/storm-0.11-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/storm-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/storm/__init__.py
 lib/python${MODPY_VERSION}/site-packages/storm/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/base.py
 lib/python${MODPY_VERSION}/site-packages/storm/base.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/cache.py
+lib/python${MODPY_VERSION}/site-packages/storm/cache.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/cextensions.c
 lib/python${MODPY_VERSION}/site-packages/storm/database.py
 lib/python${MODPY_VERSION}/site-packages/storm/database.pyc
@@ -50,8 +52,10 @@ lib/python${MODPY_VERSION}/site-packages/storm/variables.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/zope/
 lib/python${MODPY_VERSION}/site-packages/storm/zope/__init__.py
 lib/python${MODPY_VERSION}/site-packages/storm/zope/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/zope/configure.zcml
 lib/python${MODPY_VERSION}/site-packages/storm/zope/interfaces.py
 lib/python${MODPY_VERSION}/site-packages/storm/zope/interfaces.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/zope/meta.zcml
 lib/python${MODPY_VERSION}/site-packages/storm/zope/metaconfigure.py
 lib/python${MODPY_VERSION}/site-packages/storm/zope/metaconfigure.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/zope/metadirectives.py