diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 1ddee91346f..2b42fa1cb6e 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.46 2007/09/15 23:30:01 merdely Exp $
+# $OpenBSD: Makefile,v 1.47 2008/05/14 21:06:15 jakob Exp $
 
 COMMENT=	SSL encryption wrapper for standard network daemons
 
-VERSION=	4.20
+VERSION=	4.23
 DISTNAME=	stunnel-${VERSION}
 PKGNAME=	${DISTNAME}
 CATEGORIES=	security
@@ -33,6 +33,7 @@ CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-ssl=/usr \
 			--enable-ipv6 \
 			--sysconfdir=${SYSCONFDIR} \
+			--with-threads=fork \
 			--localstatedir=/var \
 			${CONFIGURE_SHARED}
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/auto
diff --git a/security/stunnel/distinfo b/security/stunnel/distinfo
index 9d04d7f0cb5..e1c5f96e7c9 100644
--- a/security/stunnel/distinfo
+++ b/security/stunnel/distinfo
@@ -1,5 +1,5 @@
-MD5 (stunnel-4.20.tar.gz) = z5lAOV01AwGPchyWJSjS7A==
-RMD160 (stunnel-4.20.tar.gz) = al37q+F4BOh+2MfHWJjbpLQleCc=
-SHA1 (stunnel-4.20.tar.gz) = qaRJsopPNKsi9rS/qoHBkEpYg8Q=
-SHA256 (stunnel-4.20.tar.gz) = KSa47abZCHIFYUXaiiYL0uq0FiHBQ/igFP+nqS6B/RA=
-SIZE (stunnel-4.20.tar.gz) = 513394
+MD5 (stunnel-4.23.tar.gz) = Xz0mfBCMwJmLj8qhbcxXZw==
+RMD160 (stunnel-4.23.tar.gz) = 5tPJMo838ztr5cr4BSmI2yND/l4=
+SHA1 (stunnel-4.23.tar.gz) = 0P74tRikS5YjaSOBpTaA4LSwFoY=
+SHA256 (stunnel-4.23.tar.gz) = i9NtsMcwxeurilXvmbXjQxN8+6zEk7DcA8zbPq9SpMg=
+SIZE (stunnel-4.23.tar.gz) = 531313
diff --git a/security/stunnel/patches/patch-Makefile_in b/security/stunnel/patches/patch-Makefile_in
index c7ec5d11476..e308e23f965 100644
--- a/security/stunnel/patches/patch-Makefile_in
+++ b/security/stunnel/patches/patch-Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2006/09/27 15:30:11 jakob Exp $
---- Makefile.in.orig	Tue Sep 26 08:56:43 2006
-+++ Makefile.in	Wed Sep 27 16:37:40 2006
-@@ -180,7 +180,7 @@ sharedstatedir = @sharedstatedir@
+$OpenBSD: patch-Makefile_in,v 1.5 2008/05/14 21:06:15 jakob Exp $
+--- Makefile.in.orig	Thu Nov  1 18:45:14 2007
++++ Makefile.in	Mon Mar 31 23:59:45 2008
+@@ -186,7 +186,7 @@ sharedstatedir = @sharedstatedir@
  ssldir = @ssldir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
 -SUBDIRS = src doc tools
 +SUBDIRS = src doc
- EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE
- docdir = $(datadir)/doc/stunnel
- doc_DATA = AUTHORS BUGS ChangeLog COPYING COPYRIGHT.GPL CREDITS \
+ EXTRA_DIST = PORTS BUGS COPYRIGHT.GPL CREDITS INSTALL.W32 INSTALL.WCE INSTALL.FIPS
+ doc_DATA = INSTALL README COPYING AUTHORS ChangeLog \
+ 	INSTALL.W32 INSTALL.WCE INSTALL.FIPS \
diff --git a/security/stunnel/patches/patch-src_client_c b/security/stunnel/patches/patch-src_client_c
index 214792fbd64..6c460967d32 100644
--- a/security/stunnel/patches/patch-src_client_c
+++ b/security/stunnel/patches/patch-src_client_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_client_c,v 1.1 2006/08/09 18:44:08 sturm Exp $
---- src/client.c.orig	Wed Aug  9 07:26:07 2006
-+++ src/client.c	Wed Aug  9 07:26:22 2006
-@@ -29,7 +29,7 @@
+$OpenBSD: patch-src_client_c,v 1.2 2008/05/14 21:06:15 jakob Exp $
+--- src/client.c.orig	Thu Mar 27 09:35:27 2008
++++ src/client.c	Mon Mar 31 23:59:14 2008
+@@ -36,7 +36,7 @@
   */
  
  /* Undefine if you have problems with make_sockets() */
diff --git a/security/stunnel/patches/patch-src_stunnel_c b/security/stunnel/patches/patch-src_stunnel_c
index 017a457587b..fc1f5693bd3 100644
--- a/security/stunnel/patches/patch-src_stunnel_c
+++ b/security/stunnel/patches/patch-src_stunnel_c
@@ -1,6 +1,6 @@
---- src/stunnel.c.orig	Tue Sep 26 10:03:59 2006
-+++ src/stunnel.c	Wed Sep 27 16:37:40 2006
-@@ -150,8 +150,8 @@ static void daemon_loop(void) {
+--- src/stunnel.c.orig	Thu Mar 27 09:27:07 2008
++++ src/stunnel.c	Mon Mar 31 23:59:14 2008
+@@ -171,8 +171,8 @@ static void daemon_loop(void) {
  #if !defined (USE_WIN32) && !defined (__vms) && !defined(USE_OS2)
      if(!(options.option.foreground))
          daemonize();
diff --git a/security/stunnel/patches/patch-tools_Makefile_in b/security/stunnel/patches/patch-tools_Makefile_in
index 8cf3d9d0458..04e474344b7 100644
--- a/security/stunnel/patches/patch-tools_Makefile_in
+++ b/security/stunnel/patches/patch-tools_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.5 2006/09/27 15:30:11 jakob Exp $
---- tools/Makefile.in.orig	Tue Sep 26 08:56:43 2006
-+++ tools/Makefile.in	Wed Sep 27 16:37:40 2006
-@@ -168,7 +168,7 @@ examplesdir = $(docdir)/examples
+$OpenBSD: patch-tools_Makefile_in,v 1.6 2008/05/14 21:06:15 jakob Exp $
+--- tools/Makefile.in.orig	Thu Nov  1 18:45:14 2007
++++ tools/Makefile.in	Mon Mar 31 23:59:14 2008
+@@ -173,7 +173,7 @@ examplesdir = $(docdir)/examples
  examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
  	stunnel.spec stunnel.init