diff --git a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
index 456aa62c9..95f2765bc 100755
--- a/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
+++ b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
@@ -5,7 +5,10 @@ if [ -n "${route_vpn_gateway}" ]; then
 elif [ -n "${ifconfig_remote}" ]; then
 	/bin/echo ${ifconfig_remote} > /tmp/${1}_router
 elif [ -n "${ifconfig_local}" ]; then
-	/usr/local/bin/python3 -c "import netaddr; import sys; print(netaddr.IPNetwork('%s/%s'%(sys.argv[1], sys.argv[2]))[1])" ${ifconfig_local} ${ifconfig_netmask} > /tmp/${1}_router
+	# XXX: We can't reliably determine the tunnels endpoint, other than parsing ifconfig.
+	#      Use our standard parser to request the tunnels other end. Eventually we could pass this to configd if
+	#      needed, but openvpn has elevated rights anyway at the moment.
+	/usr/local/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php ${1} > /tmp/${1}_router
 elif [ "${dev_type}" = "tun" -a -n "${5}" ]; then
 	/bin/echo ${5} > /tmp/${1}_router
 fi
diff --git a/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php b/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php
new file mode 100755
index 000000000..1982b1fb9
--- /dev/null
+++ b/src/etc/inc/plugins.inc.d/openvpn/tunnel_endpoint.php
@@ -0,0 +1,37 @@
+#!/usr/local/bin/php
+<?php
+
+/*
+ * Copyright (C) 2022 Deciso B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+require_once("interfaces.lib.inc");
+
+if (!empty($argv[1])) {
+    $result = legacy_interface_details($argv[1]);
+    if (!empty($result) && !empty($result['ipv4'][0]['endpoint'])) {
+        echo $result['ipv4'][0]['endpoint'];
+    }
+}