diff --git a/net/openvpn-acct-wtmpx/Makefile b/net/openvpn-acct-wtmpx/Makefile
index 14d454a3c1e3..ad7e2f92d4d8 100644
--- a/net/openvpn-acct-wtmpx/Makefile
+++ b/net/openvpn-acct-wtmpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/01/26 17:31:53 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2023/03/14 06:31:38 adam Exp $
 
 .include "../../net/openvpn/Makefile.common"
 
@@ -28,4 +28,5 @@ SPECIAL_PERMS+=	bin/logwtmpx ${SETUID_ROOT_PERMS}
 
 DEPENDS+=	openvpn>=2.4.2:../../net/openvpn
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openvpn-acct-wtmpx/distinfo b/net/openvpn-acct-wtmpx/distinfo
index 98b49a81bc9b..1fda642147d9 100644
--- a/net/openvpn-acct-wtmpx/distinfo
+++ b/net/openvpn-acct-wtmpx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.33 2022/11/23 08:02:57 adam Exp $
+$NetBSD: distinfo,v 1.34 2023/03/14 06:31:38 adam Exp $
 
-BLAKE2s (openvpn-2.5.8.tar.gz) = 7af26d7da32f771a6b34a5c25e4c0ffc6084a776c0c9f5dbd920f05a47810224
-SHA512 (openvpn-2.5.8.tar.gz) = 9cb0e79f26e7021141213d241fffaaa899575fa1640cb02d5f2a7b71f1ae12faac762ac26c2e4ddc4822550aa12cb81bab7a5b259d81230983e9b098e0f14091
-Size (openvpn-2.5.8.tar.gz) = 1875551 bytes
+BLAKE2s (openvpn-2.6.1.tar.gz) = 8645f53378fadbfdb0106e95c5375995e7f7557acd28c0de248fbdf555cae40c
+SHA512 (openvpn-2.6.1.tar.gz) = f848abc1d3ab99111b852fa52d12cb93734137acf3319b704c65cf8d1ef8abbf3cd3dbbe32b59687945e7dbd7ac7e8fc97bee57667f97700ba03d1ced4b40c31
+Size (openvpn-2.6.1.tar.gz) = 1852147 bytes
 BLAKE2s (openvpn-acct-wtmpx-20130210.tgz) = 2bb02a4e6adb7ce1d189271a6fbb6cbffd6a37d7b5e75cccebfc8dfac6dbaddd
 SHA512 (openvpn-acct-wtmpx-20130210.tgz) = 7b8fd4929e65d8d84158f62e5a17ff3adb3b4a6cff63b29038acfb368750719f2f593786ed9b02402824c19d872b188d2a46740a5c5f853e8873a71481b13aaf
 Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
diff --git a/net/openvpn-nagios/distinfo b/net/openvpn-nagios/distinfo
index 40612dc276cd..1cda60240f78 100644
--- a/net/openvpn-nagios/distinfo
+++ b/net/openvpn-nagios/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2022/11/23 08:02:58 adam Exp $
+$NetBSD: distinfo,v 1.31 2023/03/14 06:31:38 adam Exp $
 
-BLAKE2s (openvpn-2.5.8.tar.gz) = 7af26d7da32f771a6b34a5c25e4c0ffc6084a776c0c9f5dbd920f05a47810224
-SHA512 (openvpn-2.5.8.tar.gz) = 9cb0e79f26e7021141213d241fffaaa899575fa1640cb02d5f2a7b71f1ae12faac762ac26c2e4ddc4822550aa12cb81bab7a5b259d81230983e9b098e0f14091
-Size (openvpn-2.5.8.tar.gz) = 1875551 bytes
+BLAKE2s (openvpn-2.6.1.tar.gz) = 8645f53378fadbfdb0106e95c5375995e7f7557acd28c0de248fbdf555cae40c
+SHA512 (openvpn-2.6.1.tar.gz) = f848abc1d3ab99111b852fa52d12cb93734137acf3319b704c65cf8d1ef8abbf3cd3dbbe32b59687945e7dbd7ac7e8fc97bee57667f97700ba03d1ced4b40c31
+Size (openvpn-2.6.1.tar.gz) = 1852147 bytes
 BLAKE2s (openvpn-nagios-20130210.tgz) = 713b55e865350c44a314aa3b48694695f4d82b50883d1fae919f01e9545c7c34
 SHA512 (openvpn-nagios-20130210.tgz) = 80e565f32379c39eb6c7f3b4744af221ae882ff07dce9dae5bd7feb73b0edcfc7c7ac7f70d23fdcd4f492b66f095f09833deb122449840b36ea606ce91900358
 Size (openvpn-nagios-20130210.tgz) = 3034 bytes
diff --git a/net/openvpn/Makefile.common b/net/openvpn/Makefile.common
index 54a885e4791d..4b6393b4e048 100644
--- a/net/openvpn/Makefile.common
+++ b/net/openvpn/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.27 2022/11/23 08:02:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.28 2023/03/14 06:31:38 adam Exp $
 # used by net/openvpn/Makefile
 # used by net/openvpn-acct-wtmpx/Makefile
 # used by net/openvpn-nagios/Makefile
 
-OPENVPN_DISTNAME=		openvpn-2.5.8
+OPENVPN_DISTNAME=		openvpn-2.6.1
 OPENVPN_DISTFILE=		${OPENVPN_DISTNAME}.tar.gz
 OPENVPN_MASTER_SITES=		https://swupdate.openvpn.org/community/releases/
 SITES.${OPENVPN_DISTFILE}=	${OPENVPN_MASTER_SITES}
diff --git a/net/openvpn/PLIST b/net/openvpn/PLIST
index 27b7caf35fa8..fb56981ee716 100644
--- a/net/openvpn/PLIST
+++ b/net/openvpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2021/10/05 19:25:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2023/03/14 06:31:38 adam Exp $
 include/openvpn-msg.h
 include/openvpn-plugin.h
 ${PLIST.pam}lib/openvpn/plugins/openvpn-plugin-auth-pam.la
@@ -10,7 +10,6 @@ share/doc/openvpn/COPYING
 share/doc/openvpn/COPYRIGHT.GPL
 share/doc/openvpn/Changes.rst
 share/doc/openvpn/README
-share/doc/openvpn/README.IPv6
 ${PLIST.pam}share/doc/openvpn/README.auth-pam
 share/doc/openvpn/README.down-root
 share/doc/openvpn/README.mbedtls
@@ -28,8 +27,6 @@ share/examples/openvpn/config/openvpn-startup.sh
 share/examples/openvpn/config/server.conf
 share/examples/openvpn/config/tls-home.conf
 share/examples/openvpn/config/tls-office.conf
-share/examples/openvpn/config/xinetd-client-config
-share/examples/openvpn/config/xinetd-server-config
 share/examples/openvpn/keys/README
 share/examples/openvpn/keys/ca.crt
 share/examples/openvpn/keys/ca.key
@@ -50,5 +47,6 @@ share/examples/openvpn/keys/ta.key
 share/examples/openvpn/scripts/auth-pam.pl
 share/examples/openvpn/scripts/bridge-start
 share/examples/openvpn/scripts/bridge-stop
+share/examples/openvpn/scripts/totpauth.py
 share/examples/openvpn/scripts/ucn.pl
 share/examples/openvpn/scripts/verify-cn
diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo
index 50bc7614396c..f0339f7b4c23 100644
--- a/net/openvpn/distinfo
+++ b/net/openvpn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.58 2022/11/23 08:02:57 adam Exp $
+$NetBSD: distinfo,v 1.59 2023/03/14 06:31:38 adam Exp $
 
-BLAKE2s (openvpn-2.5.8.tar.gz) = 7af26d7da32f771a6b34a5c25e4c0ffc6084a776c0c9f5dbd920f05a47810224
-SHA512 (openvpn-2.5.8.tar.gz) = 9cb0e79f26e7021141213d241fffaaa899575fa1640cb02d5f2a7b71f1ae12faac762ac26c2e4ddc4822550aa12cb81bab7a5b259d81230983e9b098e0f14091
-Size (openvpn-2.5.8.tar.gz) = 1875551 bytes
+BLAKE2s (openvpn-2.6.1.tar.gz) = 8645f53378fadbfdb0106e95c5375995e7f7557acd28c0de248fbdf555cae40c
+SHA512 (openvpn-2.6.1.tar.gz) = f848abc1d3ab99111b852fa52d12cb93734137acf3319b704c65cf8d1ef8abbf3cd3dbbe32b59687945e7dbd7ac7e8fc97bee57667f97700ba03d1ced4b40c31
+Size (openvpn-2.6.1.tar.gz) = 1852147 bytes
 SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143