diff --git a/databases/py-storm/Makefile b/databases/py-storm/Makefile
index 82913fbba4a..df97188a42a 100644
--- a/databases/py-storm/Makefile
+++ b/databases/py-storm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2009/10/11 16:36:31 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2009/10/16 15:17:02 eric Exp $
 
 COMMENT=		generic object relational mapper for Python
 
-MODPY_EGG_VERSION=	0.14
+MODPY_EGG_VERSION=	0.15
 DISTNAME=		storm-${MODPY_EGG_VERSION}
-PKGNAME=		py-${DISTNAME}p1
+PKGNAME=		py-${DISTNAME}
 
 CATEGORIES=		databases
 
diff --git a/databases/py-storm/distinfo b/databases/py-storm/distinfo
index 52d8d7b96d4..a525a003d9f 100644
--- a/databases/py-storm/distinfo
+++ b/databases/py-storm/distinfo
@@ -1,5 +1,5 @@
-MD5 (storm-0.14.tar.bz2) = tTKbWCKWQHkYlea1o3hFqw==
-RMD160 (storm-0.14.tar.bz2) = oqrCppDl8uNlRNm3TcN0/VN5H30=
-SHA1 (storm-0.14.tar.bz2) = I/g1T355zoF6ai5CM/gmriA5xRM=
-SHA256 (storm-0.14.tar.bz2) = rluOemseDw8oTU6xaeWDvY7158z8io/xdYfMkG5mTz0=
-SIZE (storm-0.14.tar.bz2) = 165197
+MD5 (storm-0.15.tar.bz2) = Ze9XFW4SmrCbIjfa12zf/g==
+RMD160 (storm-0.15.tar.bz2) = glyvM6ckj2tlxtQazoP4D+Lqr3c=
+SHA1 (storm-0.15.tar.bz2) = v2esc/kl1n8ox92p8sddIV6fIro=
+SHA256 (storm-0.15.tar.bz2) = USOWeHxDYZJ72rIj6VlIYVDiCiWMH3E7IDc90Mps9xM=
+SIZE (storm-0.15.tar.bz2) = 173020
diff --git a/databases/py-storm/patches/patch-test b/databases/py-storm/patches/patch-test
deleted file mode 100644
index f703ad587c5..00000000000
--- a/databases/py-storm/patches/patch-test
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-test,v 1.1 2008/01/06 17:09:36 merdely Exp $
-
-This patch works around a strange problem with macppc.  Even though the
-regression tests pass, there is an output problem that causes
-"make regress" to fail.
-
---- test.orig	Sun Jan  6 11:47:52 2008
-+++ test	Sun Jan  6 11:48:19 2008
-@@ -137,6 +137,8 @@ def test_with_unittest():
-     unittest_summary = Summary()
-     doctest_summary = Summary()
- 
-+    sys.stdout = open('/dev/null')
-+
-     if unittests:
-         print "Running unittests..."
-         for relpath in unittests:
diff --git a/databases/py-storm/pkg/PLIST b/databases/py-storm/pkg/PLIST
index 960fb02babf..07376f3e8c4 100644
--- a/databases/py-storm/pkg/PLIST
+++ b/databases/py-storm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/10/11 16:36:31 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/10/16 15:17:02 eric Exp $
 lib/python${MODPY_VERSION}/site-packages/storm/
 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
@@ -66,6 +66,8 @@ 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/adapters.py
+lib/python${MODPY_VERSION}/site-packages/storm/zope/adapters.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