diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index f8cc39b53..df3d46b5e 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		0.3
+PLUGIN_VERSION=		0.4
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
index 9e26b48d7..f5230ed40 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServiceController.php
@@ -44,4 +44,26 @@ class ServiceController extends ApiMutableServiceControllerBase
     static protected $internalServiceTemplate = 'OPNsense/Wireguard';
     static protected $internalServiceEnabled = 'enabled';
     static protected $internalServiceName = 'wireguard';
+
+    /**
+     * show wireguard config
+     * @return array
+     */
+    public function showconfAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("wireguard showconf");
+        return array("response" => $response);
+    }
+
+    /**
+     * show wireguard handshakes
+     * @return array
+     */
+    public function showhandshakeAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdRun("wireguard showhandshake");
+        return array("response" => $response);
+    }
 }
diff --git a/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt b/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
index 1d95b849d..33a442e11 100644
--- a/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
+++ b/net/wireguard/src/opnsense/mvc/app/views/OPNsense/Wireguard/general.volt
@@ -32,6 +32,8 @@ POSSIBILITY OF SUCH DAMAGE.
     <li class="active"><a data-toggle="tab" href="#general">{{ lang._('General') }}</a></li>
     <li><a data-toggle="tab" href="#servers">{{ lang._('Server') }}</a></li>
     <li><a data-toggle="tab" href="#clients">{{ lang._('Endpoints') }}</a></li>
+    <li><a data-toggle="tab" href="#showconf">{{ lang._('List Configuration') }}</a></li>
+    <li><a data-toggle="tab" href="#showhandshake">{{ lang._('Handshakes') }}</a></li>
 </ul>
 
 <div class="tab-content content-box tab-content">
@@ -102,12 +104,32 @@ POSSIBILITY OF SUCH DAMAGE.
             <br /><br />
         </div>
     </div>
+    <div id="showconf" class="tab-pane fade in">
+      <pre id="listshowconf"></pre>
+    </div>
+    <div id="showhandshake" class="tab-pane fade in">
+      <pre id="listshowhandshake"></pre>
+    </div>
 </div>
 
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditWireguardClient,'id':'dialogEditWireguardClient','label':lang._('Edit Endpoint')])}}
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditWireguardServer,'id':'dialogEditWireguardServer','label':lang._('Edit Server')])}}
 
 <script>
+
+// Put API call into a function, needed for auto-refresh
+function update_showconf() {
+    ajaxCall(url="/api/wireguard/service/showconf", sendData={}, callback=function(data,status) {
+        $("#listshowconf").text(data['response']);
+    });
+}
+
+function update_showhandshake() {
+    ajaxCall(url="/api/wireguard/service/showhandshake", sendData={}, callback=function(data,status) {
+        $("#listshowhandshake").text(data['response']);
+    });
+}
+
 $( document ).ready(function() {
     var data_get_map = {'frm_general_settings':"/api/wireguard/general/get"};
     mapDataToFormUI(data_get_map).done(function(data){
@@ -135,6 +157,10 @@ $( document ).ready(function() {
         }
     );
 
+    // Call function update_neighbor with a auto-refresh of 5 seconds
+    setInterval(update_showconf, 5000);
+    setInterval(update_showhandshake, 5000);
+
     $("#saveAct").click(function(){
         saveFormToEndpoint(url="/api/wireguard/general/set", formid='frm_general_settings',callback_ok=function(){
         $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
diff --git a/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf b/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
index 46932513f..9f04170f0 100644
--- a/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
+++ b/net/wireguard/src/opnsense/service/conf/actions.d/actions_wireguard.conf
@@ -21,3 +21,15 @@ command:/usr/local/opnsense/scripts/OPNsense/Wireguard/genkey.sh
 parameters: %s
 type:script_output
 message:generating Wireguard keys
+
+[showconf]
+command:/usr/local/bin/wg show all
+parameters:
+type:script_output
+message:show Wireguard config
+
+[showhandshake]
+command:/usr/local/bin/wg show all latest-handshakes
+parameters:
+type:script_output
+message:show Wireguard handshakes