diff --git a/plist b/plist
index 0d24a4260..3a03dd57c 100644
--- a/plist
+++ b/plist
@@ -42,6 +42,9 @@
 /usr/local/etc/inc/plugins.inc.d/openvpn.inc
 /usr/local/etc/inc/plugins.inc.d/openvpn/attributes.sh
 /usr/local/etc/inc/plugins.inc.d/openvpn/auth-user.php
+/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
+/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
+/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify
 /usr/local/etc/inc/plugins.inc.d/openvpn/tls-verify.php
 /usr/local/etc/inc/plugins.inc.d/openvpn/wizard.inc
 /usr/local/etc/inc/plugins.inc.d/pf.inc
@@ -926,9 +929,6 @@
 /usr/local/sbin/opnsense-auth
 /usr/local/sbin/opnsense-importer
 /usr/local/sbin/opnsense-installer
-/usr/local/sbin/ovpn-linkdown
-/usr/local/sbin/ovpn-linkup
-/usr/local/sbin/ovpn_auth_verify
 /usr/local/sbin/ping_hosts.sh
 /usr/local/sbin/pluginctl
 /usr/local/sbin/ppp-linkdown
diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 60420bc77..3c8bf9a35 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -578,8 +578,8 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
     $conf .= "proto {$proto}\n";
     $conf .= "cipher {$cipher}\n";
     $conf .= "auth {$digest}\n";
-    $conf .= "up /usr/local/sbin/ovpn-linkup\n";
-    $conf .= "down /usr/local/sbin/ovpn-linkdown\n";
+    $conf .= "up /usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkup\n";
+    $conf .= "down /usr/local/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown\n";
 
     switch($settings['mode']) {
         case 'server_user':
@@ -688,7 +688,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
                     if ($settings['strictusercn']) {
                         $strictusercn = "true";
                     }
-                    $conf .= "auth-user-pass-verify \"/usr/local/sbin/ovpn_auth_verify user '{$settings['authmode']}' '{$strictusercn}' '{$mode_id}'\" via-env\n";
+                    $conf .= "auth-user-pass-verify \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify user '{$settings['authmode']}' '{$strictusercn}' '{$mode_id}'\" via-env\n";
                 }
                 break;
         }
@@ -702,7 +702,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
                 $cert = lookup_cert($settings['certref']);
                 /* XXX: Seems not used at all! */
                 $servercn = urlencode(cert_get_cn($cert['crt']));
-                $conf .= "tls-verify \"/usr/local/sbin/ovpn_auth_verify tls '{$servercn}' {$settings['cert_depth']}\"\n";
+                $conf .= "tls-verify \"/usr/local/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify tls '{$servercn}' {$settings['cert_depth']}\"\n";
             }
         }
 
diff --git a/src/sbin/ovpn-linkdown b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
similarity index 100%
rename from src/sbin/ovpn-linkdown
rename to src/etc/inc/plugins.inc.d/openvpn/ovpn-linkdown
diff --git a/src/sbin/ovpn-linkup b/src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
similarity index 100%
rename from src/sbin/ovpn-linkup
rename to src/etc/inc/plugins.inc.d/openvpn/ovpn-linkup
diff --git a/src/sbin/ovpn_auth_verify b/src/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify
similarity index 100%
rename from src/sbin/ovpn_auth_verify
rename to src/etc/inc/plugins.inc.d/openvpn/ovpn_auth_verify