diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 16fc2331366..784f6eed4c8 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2008/03/15 17:38:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2008/04/21 15:03:12 merdely Exp $
 
 SHARED_ONLY=	Yes
 
@@ -32,6 +32,10 @@ BUILD_DEPENDS=	::devel/bison
 WRKDIST=	${WRKDIR}/${DISTNAME:S/-/_/}
 NO_REGRESS=	Yes
 
+.if ${MACHINE_ARCH} == "alpha"
+STDCCFLAGS+=	-fPIC
+.endif
+
 USE_GMAKE=	Yes
 ALL_TARGET=	optshared
 MAKE_ENV+=	STDCCFLAGS="${STDCCFLAGS} -I${X11BASE}/include \
diff --git a/devel/pwlib/patches/patch-src_ptclib_pssl_cxx b/devel/pwlib/patches/patch-src_ptclib_pssl_cxx
index 4b5a8e0e373..7f27bc01f6e 100644
--- a/devel/pwlib/patches/patch-src_ptclib_pssl_cxx
+++ b/devel/pwlib/patches/patch-src_ptclib_pssl_cxx
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_ptclib_pssl_cxx,v 1.2 2008/03/15 17:38:07 ajacoutot Exp $
+$OpenBSD: patch-src_ptclib_pssl_cxx,v 1.3 2008/04/21 15:03:12 merdely Exp $
 --- src/ptclib/pssl.cxx.orig	Fri Jan  4 14:17:19 2008
 +++ src/ptclib/pssl.cxx	Fri Jan  4 14:17:32 2008
 @@ -794,7 +794,7 @@ PSSLDiffieHellman::~PSSLDiffieHellman()
@@ -6,7 +6,7 @@ $OpenBSD: patch-src_ptclib_pssl_cxx,v 1.2 2008/03/15 17:38:07 ajacoutot Exp $
  }
  
 -#if defined(__BEOS__) || defined(__APPLE__) || defined(__OpenBSD__)
-+#if defined(__BEOS__) || defined(__APPLE__) || (defined(__OpenBSD__) && !defined(__PPC__))
++#if defined(__BEOS__) || defined(__APPLE__) || (defined(__OpenBSD__) && !defined(__PPC__) && !defined(__alpha__))
  // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of
  // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load
  // 5/26/06 Hannes Friederich - Mac OS X seems to need that fix too...