diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index 6ba9b5694a4..a173cda93c7 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.2 2005/09/19 02:10:46 djm Exp $
+# $OpenBSD: Makefile,v 1.3 2006/05/25 13:39:08 alek Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"SQLite3 adapter for Python"
 
-VERSION=	2.0.4
-DISTNAME=	pysqlite-${VERSION}
+DISTNAME=	pysqlite-2.2.2
 PKGNAME=	${DISTNAME:S/^pysqlite/py-sqlite2/}
 CATEGORIES=	databases devel
 
-MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/2.0/${VERSION}/
+MAINTAINER=	Eric Faurot <eric.faurot@gmail.com>
+
+MASTER_SITES=	http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/
 HOMEPAGE=	http://pysqlite.org/
 
 # BSD-like
@@ -29,7 +30,8 @@ pre-configure:
 	mv ${WRKSRC}/setup.cfg_ ${WRKSRC}/setup.cfg
 
 do-regress: fake
-	@cd ${WRKSRC}/scripts && ${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
-		${MODPY_BIN} ./test-pysqlite
+	@cd ${WRKSRC}/pysqlite2/test && \
+		${SETENV} PYTHONPATH=${WRKINST}${MODPY_SITEPKG} \
+		${MODPY_BIN} ./regression.py
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlite2/distinfo b/databases/py-sqlite2/distinfo
index 17f2a1dbdc9..3996d7a55f6 100644
--- a/databases/py-sqlite2/distinfo
+++ b/databases/py-sqlite2/distinfo
@@ -1,4 +1,4 @@
-MD5 (pysqlite-2.0.4.tar.gz) = 8eecd39eb728f3af634ebc67e823b389
-RMD160 (pysqlite-2.0.4.tar.gz) = fc5c6ff11770c140700cf467177022907a3debf3
-SHA1 (pysqlite-2.0.4.tar.gz) = 5205fd35333a1038890d7afd9e131a2624161b05
-SIZE (pysqlite-2.0.4.tar.gz) = 57608
+MD5 (pysqlite-2.2.2.tar.gz) = 3260547d3f11c85613b2de8ed529a4fc
+RMD160 (pysqlite-2.2.2.tar.gz) = e2e1f18072ce56d193c22b608ea237692bc56353
+SHA1 (pysqlite-2.2.2.tar.gz) = 0a8559384d95b242122c52cf98c7f6bd9334559e
+SIZE (pysqlite-2.2.2.tar.gz) = 75176
diff --git a/databases/py-sqlite2/patches/patch-setup_py b/databases/py-sqlite2/patches/patch-setup_py
index 57b5b48542f..d59912e799f 100644
--- a/databases/py-sqlite2/patches/patch-setup_py
+++ b/databases/py-sqlite2/patches/patch-setup_py
@@ -1,10 +1,10 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2005/05/22 09:37:25 djm Exp $
---- setup.py.orig	Sun May 22 14:40:30 2005
-+++ setup.py	Sun May 22 14:41:33 2005
-@@ -87,11 +87,11 @@ def build_docs():
+$OpenBSD: patch-setup_py,v 1.2 2006/05/25 13:39:08 alek Exp $
+--- setup.py.orig	Tue Apr 11 00:13:37 2006
++++ setup.py	Thu Apr 20 01:56:14 2006
+@@ -104,11 +104,11 @@ def get_setup_args():
+         print "Fatal error: PYSQLITE_VERSION could not be detected!"
+         sys.exit(1)
  
- def main():
-     build_docs()
 -    data_files = [("pysqlite2-doc",
 +    data_files = [("share/doc/py-sqlite2",
                          glob.glob("doc/*.html") \
diff --git a/databases/py-sqlite2/pkg/PLIST b/databases/py-sqlite2/pkg/PLIST
index 44b34b5e0a1..b0f79a2502c 100644
--- a/databases/py-sqlite2/pkg/PLIST
+++ b/databases/py-sqlite2/pkg/PLIST
@@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2005/09/19 02:10:46 djm Exp $
-bin/test-pysqlite
+@comment $OpenBSD: PLIST,v 1.3 2006/05/25 13:39:08 alek Exp $
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/__init__.pyc
@@ -13,6 +12,10 @@ lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/dbapi.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/factory.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/hooks.pyc
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.py
+lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/regression.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.py
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/transactions.pyc
 lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/types.py
@@ -22,6 +25,8 @@ lib/python${MODPY_VERSION}/site-packages/pysqlite2/test/userfunctions.pyc
 share/doc/py-sqlite2/
 share/doc/py-sqlite2/default.css
 share/doc/py-sqlite2/docutils.css
+share/doc/py-sqlite2/install-source-win32.html
+share/doc/py-sqlite2/install-source-win32.txt
 share/doc/py-sqlite2/install-source.html
 share/doc/py-sqlite2/install-source.txt
 share/doc/py-sqlite2/silvercity.css
@@ -31,6 +36,8 @@ share/examples/py-sqlite2/
 share/examples/py-sqlite2/adapter_datetime.py
 share/examples/py-sqlite2/adapter_point_1.py
 share/examples/py-sqlite2/adapter_point_2.py
+share/examples/py-sqlite2/collation_reverse.py
+share/examples/py-sqlite2/complete_statement.py
 share/examples/py-sqlite2/connect_db_1.py
 share/examples/py-sqlite2/connect_db_2.py
 share/examples/py-sqlite2/converter_point.py
@@ -50,4 +57,8 @@ share/examples/py-sqlite2/mysumaggr.py
 share/examples/py-sqlite2/parse_colnames.py
 share/examples/py-sqlite2/pysqlite_datetime.py
 share/examples/py-sqlite2/row_factory.py
+share/examples/py-sqlite2/rowclass.py
+share/examples/py-sqlite2/shared_cache.py
+share/examples/py-sqlite2/shortcut_methods.py
 share/examples/py-sqlite2/simple_tableprinter.py
+share/examples/py-sqlite2/text_factory.py