diff --git a/security/py-sslwrapper/Makefile b/security/py-sslwrapper/Makefile
index eb5a5504f95..39c0c493f12 100644
--- a/security/py-sslwrapper/Makefile
+++ b/security/py-sslwrapper/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2003/07/31 19:12:00 sturm Exp $
+# $OpenBSD: Makefile,v 1.9 2004/01/18 13:23:06 sturm Exp $
 
 COMMENT=	"OpenSSL Wrappers for Python"
 
@@ -7,10 +7,11 @@ DISTNAME=	POW-${VERSION}
 PKGNAME=	py-sslwrapper-${VERSION}
 CATEGORIES=    	security devel
 
-HOMEPAGE=	http://www.sf.net/projects/pow/
+HOMEPAGE=	http://www.sourceforge.net/projects/pow/
 
 MAINTAINER=	Shell Hung <shell@openbsd.org>
 
+# BSD
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -22,7 +23,8 @@ MODULES=	python
 
 NO_REGRESS=	Yes
 
-post-patch:
+pre-build:
 	@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
+	@perl -pi -e 's,%%MODPY_VERSION%%,${MODPY_VERSION},g' ${WRKSRC}/POW.c
 
 .include <bsd.port.mk>
diff --git a/security/py-sslwrapper/patches/patch-POW_c b/security/py-sslwrapper/patches/patch-POW_c
index f86902e7b9d..a026b3deb0a 100644
--- a/security/py-sslwrapper/patches/patch-POW_c
+++ b/security/py-sslwrapper/patches/patch-POW_c
@@ -1,4 +1,4 @@
-$OpenBSD: patch-POW_c,v 1.3 2004/01/05 03:54:02 espie Exp $
+$OpenBSD: patch-POW_c,v 1.4 2004/01/18 13:23:06 sturm Exp $
 --- POW.c.orig	2001-11-23 02:03:09.000000000 +0100
 +++ POW.c	2004-01-05 04:51:20.000000000 +0100
 @@ -34,7 +34,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-POW_c,v 1.3 2004/01/05 03:54:02 espie Exp $
  /*****************************************************************************/
  
 -#include <python2.1/Python.h>
-+#include <python2.2/Python.h>
++#include <python%%MODPY_VERSION%%/Python.h>
  
  #include <openssl/crypto.h>
  #include <openssl/rand.h>
diff --git a/security/py-sslwrapper/patches/patch-setup_py b/security/py-sslwrapper/patches/patch-setup_py
index f014d5e5857..a7f8f9ad498 100644
--- a/security/py-sslwrapper/patches/patch-setup_py
+++ b/security/py-sslwrapper/patches/patch-setup_py
@@ -1,10 +1,16 @@
-$OpenBSD: patch-setup_py,v 1.4 2004/01/05 03:54:03 espie Exp $
+$OpenBSD: patch-setup_py,v 1.5 2004/01/18 13:23:06 sturm Exp $
 --- setup.py.orig	2001-11-23 01:44:34.000000000 +0100
-+++ setup.py	2004-01-05 04:30:59.000000000 +0100
-@@ -10,5 +10,5 @@ setup(name='POW',
++++ setup.py	2004-01-18 14:13:42.000000000 +0100
+@@ -5,10 +5,10 @@ setup(name='POW',
+       description='Python OpenSSL Wrappers',
+       author='Peter Shannon',
+       author_email='peter_shannon@yahoo.com',
+-      licence='BSD',
++      license='BSD',
+       url='http://www.sourceforge.net/projects/pow',
        ext_modules=[  Extension('POW', 
                       ['POW.c'], 
                       libraries=['ssl', 'crypto'],
 -                     include_dirs=['/usr/local/lib']   )])
-+                     include_dirs=['/usr/include', '/usr/local/include']   )])
++                     include_dirs=['/usr/include', '%%LOCALBASE%%/include']   )])