diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 672cbdd657e..44fdd98af34 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2006/12/15 09:56:14 robert Exp $
+# $OpenBSD: Makefile,v 1.14 2007/07/27 21:20:29 aanriot Exp $
 # Original from: Jorge A. Cortes Montiel <jcortes@bsdcoders.org>
 
-COMMENT=	"easy-to-use, robust, and highly configurable VPN"
+COMMENT=	easy-to-use, robust, and highly configurable VPN
 
-VERSION=	2.0.6
+VERSION=	2.0.9
 DISTNAME=	openvpn-${VERSION}
-PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net security
 
 HOMEPAGE=	http://openvpn.net/
@@ -27,6 +26,7 @@ SEPARATE_BUILD=	concurrent
 
 FAKE=		lib
 CONFIGURE_STYLE=gnu
+
 # pthread support is supposed to be unstable on OpenBSD
 CONFIGURE_ARGS+=--disable-pthread \
 		--with-lzo-headers=${DEPBASE}/include \
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index ad7769496ea..cdc95f858a8 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,5 +1,5 @@
-MD5 (openvpn-2.0.6.tar.gz) = jS+V+oJeWDY6Z2sl1IFapw==
-RMD160 (openvpn-2.0.6.tar.gz) = zzzYB7tle68xfolrV5AJWM9EKmM=
-SHA1 (openvpn-2.0.6.tar.gz) = BG84EYMaBuT7ycZFRPquzwRUeuU=
-SHA256 (openvpn-2.0.6.tar.gz) = EHTJ+1p4gebU/wsSXPHkSp+2UL7vGH8GF4VphSJFMAM=
-SIZE (openvpn-2.0.6.tar.gz) = 664816
+MD5 (openvpn-2.0.9.tar.gz) = YHRQCLkLfb4l/oM3xVD+xg==
+RMD160 (openvpn-2.0.9.tar.gz) = 4rcwccjW6fupOv5GNVo1iCdz2TY=
+SHA1 (openvpn-2.0.9.tar.gz) = bpAJlLyeShQJYXOTHFZawnsOe7U=
+SHA256 (openvpn-2.0.9.tar.gz) = NHxVHnyIr/wfS3pLcVCAJTySmNzFEu0p/oylzSbQFdk=
+SIZE (openvpn-2.0.9.tar.gz) = 669076
diff --git a/net/openvpn/pkg/PLIST b/net/openvpn/pkg/PLIST
index 2a826f92ea7..4f661c323ac 100644
--- a/net/openvpn/pkg/PLIST
+++ b/net/openvpn/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2006/12/15 09:56:14 robert Exp $
+@comment $OpenBSD: PLIST,v 1.8 2007/07/27 21:20:29 aanriot Exp $
 @newgroup _openvpn:577
 @newuser _openvpn:577:_openvpn:daemon:OpenVPN Daemon:/nonexistent:/sbin/nologin
 @man man/man8/openvpn.8
@@ -6,6 +6,7 @@ sbin/openvpn
 share/examples/openvpn/
 share/examples/openvpn/easy-rsa/
 share/examples/openvpn/easy-rsa/2.0/
+@comment share/examples/openvpn/easy-rsa/2.0/Makefile
 share/examples/openvpn/easy-rsa/2.0/README
 share/examples/openvpn/easy-rsa/2.0/build-ca
 share/examples/openvpn/easy-rsa/2.0/build-dh
@@ -19,11 +20,13 @@ share/examples/openvpn/easy-rsa/2.0/build-req-pass
 share/examples/openvpn/easy-rsa/2.0/clean-all
 share/examples/openvpn/easy-rsa/2.0/inherit-inter
 share/examples/openvpn/easy-rsa/2.0/list-crl
+@comment share/examples/openvpn/easy-rsa/2.0/openssl-0.9.6.cnf
 share/examples/openvpn/easy-rsa/2.0/openssl.cnf
 share/examples/openvpn/easy-rsa/2.0/pkitool
 share/examples/openvpn/easy-rsa/2.0/revoke-full
 share/examples/openvpn/easy-rsa/2.0/sign-req
 share/examples/openvpn/easy-rsa/2.0/vars
+@comment share/examples/openvpn/easy-rsa/2.0/whichopensslcnf
 share/examples/openvpn/easy-rsa/README
 share/examples/openvpn/easy-rsa/build-ca
 share/examples/openvpn/easy-rsa/build-dh