diff --git a/databases/py-storm/Makefile b/databases/py-storm/Makefile
index de15f518eb4..7a20d4cafcd 100644
--- a/databases/py-storm/Makefile
+++ b/databases/py-storm/Makefile
@@ -1,17 +1,16 @@
-# $OpenBSD: Makefile,v 1.10 2010/08/30 20:53:57 fgsch Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/10 13:24:41 eric Exp $
 
 COMMENT=		generic object relational mapper for Python
 
-MODPY_EGG_VERSION=	0.16.0
+MODPY_EGG_VERSION=	0.18
 DISTNAME=		storm-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION =		0
 
 CATEGORIES=		databases
 
 HOMEPAGE=		https://storm.canonical.com/
 
-MAINTAINER=		Will Maier <wcmaier@openbsd.org>
+MAINTAINER=		Eric Faurot <eric@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://launchpad.net/storm/trunk/0.16/+download/
+MASTER_SITES=		http://launchpad.net/storm/trunk/0.18/+download/
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		lang/python
diff --git a/databases/py-storm/distinfo b/databases/py-storm/distinfo
index 7c7722df796..ffe86730ded 100644
--- a/databases/py-storm/distinfo
+++ b/databases/py-storm/distinfo
@@ -1,5 +1,5 @@
-MD5 (storm-0.16.0.tar.bz2) = ZifSoBt/6u2yCzXlV8ze5Q==
-RMD160 (storm-0.16.0.tar.bz2) = 4eJKAgT13c5a+p5cZWEyXd1WmSQ=
-SHA1 (storm-0.16.0.tar.bz2) = SFscOn/ILrJA11Jwc+tlsL6DId4=
-SHA256 (storm-0.16.0.tar.bz2) = YlQNJ5gzvPUtoiWP5L+kbZCxX0cHbDVznaJftSBiZMg=
-SIZE (storm-0.16.0.tar.bz2) = 177684
+MD5 (storm-0.18.tar.bz2) = +/zUExvDK+4iGdSCh+DLXw==
+RMD160 (storm-0.18.tar.bz2) = 5meqR0poWCtxBkIE/Ku31ErfBZw=
+SHA1 (storm-0.18.tar.bz2) = QlsAx1T1yahdOFocPmI4jGYLdvM=
+SHA256 (storm-0.18.tar.bz2) = 58Cqq+Y++xEHCB4BqPz11RhA/3JhAd+cuwjG6I0d7gY=
+SIZE (storm-0.18.tar.bz2) = 186569
diff --git a/databases/py-storm/pkg/PLIST b/databases/py-storm/pkg/PLIST
index 07376f3e8c4..bc405d337f3 100644
--- a/databases/py-storm/pkg/PLIST
+++ b/databases/py-storm/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2009/10/16 15:17:02 eric Exp $
+@comment $OpenBSD: PLIST,v 1.8 2010/11/10 13:24:41 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
@@ -51,6 +51,13 @@ lib/python${MODPY_VERSION}/site-packages/storm/properties.py
 lib/python${MODPY_VERSION}/site-packages/storm/properties.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/references.py
 lib/python${MODPY_VERSION}/site-packages/storm/references.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/schema/
+lib/python${MODPY_VERSION}/site-packages/storm/schema/__init__.py
+lib/python${MODPY_VERSION}/site-packages/storm/schema/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/schema/patch.py
+lib/python${MODPY_VERSION}/site-packages/storm/schema/patch.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/schema/schema.py
+lib/python${MODPY_VERSION}/site-packages/storm/schema/schema.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/sqlobject.py
 lib/python${MODPY_VERSION}/site-packages/storm/sqlobject.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/store.py
@@ -76,5 +83,9 @@ 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
 lib/python${MODPY_VERSION}/site-packages/storm/zope/metadirectives.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/zope/schema.py
+lib/python${MODPY_VERSION}/site-packages/storm/zope/schema.pyc
+lib/python${MODPY_VERSION}/site-packages/storm/zope/testing.py
+lib/python${MODPY_VERSION}/site-packages/storm/zope/testing.pyc
 lib/python${MODPY_VERSION}/site-packages/storm/zope/zstorm.py
 lib/python${MODPY_VERSION}/site-packages/storm/zope/zstorm.pyc