diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index d9b89a1c8554..686f62e010d1 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -1,7 +1,7 @@
 # Created by: Matthias Andree <mandree@FreeBSD.org>
 
 PORTNAME=		openvpn
-DISTVERSION=		2.5.3
+DISTVERSION=		2.5.4
 PORTREVISION?=		0
 CATEGORIES=		security net net-vpn
 MASTER_SITES=		https://swupdate.openvpn.org/community/releases/ \
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--enable-strict
 # set PLUGIN_LIBDIR so that unqualified plugin paths are found:
 CONFIGURE_ENV+=		PLUGINDIR="${PREFIX}/lib/openvpn/plugins"
 
-CONFLICTS_INSTALL?=	openvpn-2.[!5].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]*
+CONFLICTS_INSTALL?=	openvpn-2.[!5].* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]*
 
 SUB_FILES=		pkg-message openvpn-client
 
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 942785f21e07..52de3f3f856e 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624052196
-SHA256 (openvpn-2.5.3.tar.xz) = fb6a9943c603a1951ca13e9267653f8dd650c02f84bccd2b9d20f06a4c9c9a7e
-SIZE (openvpn-2.5.3.tar.xz) = 1149004
+TIMESTAMP = 1633456661
+SHA256 (openvpn-2.5.4.tar.xz) = 56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436
+SIZE (openvpn-2.5.4.tar.xz) = 1150604
diff --git a/security/openvpn/pkg-plist b/security/openvpn/pkg-plist
index a3495c2a6273..d247b39c1eed 100644
--- a/security/openvpn/pkg-plist
+++ b/security/openvpn/pkg-plist
@@ -4,6 +4,7 @@ lib/openvpn/plugins/openvpn-plugin-auth-pam.so
 lib/openvpn/plugins/openvpn-plugin-down-root.so
 libexec/openvpn-client.down
 libexec/openvpn-client.up
+man/man5/openvpn-examples.5.gz
 man/man8/openvpn.8.gz
 sbin/openvpn
 sbin/openvpn-client