diff --git a/dns/bind/Makefile b/dns/bind/Makefile
index 8717b2f01..773381a4c 100644
--- a/dns/bind/Makefile
+++ b/dns/bind/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		bind
-PLUGIN_VERSION=		1.28
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.29
 PLUGIN_COMMENT=		BIND domain name service
 PLUGIN_DEPENDS=		bind918
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/dns/bind/pkg-descr b/dns/bind/pkg-descr
index 500ed4c02..160e424f5 100644
--- a/dns/bind/pkg-descr
+++ b/dns/bind/pkg-descr
@@ -10,6 +10,11 @@ WWW: https://www.isc.org
 Plugin Changelog
 ================
 
+1.29
+
+* Migrate General Log to Syslog
+* Add Check & Preview button to Primary Zones grid
+
 1.28
 
 * Add break-dnssec toggle when using filter-aaaa on IPv4/IPv6 clients (contributed by doktornotor)
diff --git a/dns/bind/src/etc/inc/plugins.inc.d/bind.inc b/dns/bind/src/etc/inc/plugins.inc.d/bind.inc
index 627e10808..e1d8b1b2c 100644
--- a/dns/bind/src/etc/inc/plugins.inc.d/bind.inc
+++ b/dns/bind/src/etc/inc/plugins.inc.d/bind.inc
@@ -99,3 +99,16 @@ function bind_configure_do($verbose)
 
     service_log("done.\n", $verbose);
 }
+
+/**
+ *  register syslog facilities
+ * @return array
+ */
+function bind_syslog()
+{
+    $syslogconf = [];
+
+    $syslogconf['bind'] = ['facility' => ['named']];
+
+    return $syslogconf;
+}
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php
index d712f7fde..cbcb0e7c2 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/Api/GeneralController.php
@@ -31,9 +31,32 @@
 namespace OPNsense\Bind\Api;
 
 use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
 
 class GeneralController extends ApiMutableModelControllerBase
 {
     protected static $internalModelClass = '\OPNsense\Bind\General';
     protected static $internalModelName = 'general';
+
+    public function zonetestAction($zonename = null)
+    {
+        $response = "request error";
+        if ($this->request->hasPost("zone")) {
+            $zonename = $this->request->getPost("zone");
+            $backend = new Backend();
+            $response = trim($backend->configdpRun("bind zone check", [$zonename]));
+        }
+        return array("response" => $response);
+    }
+    
+    public function zoneshowAction($zonename = null)
+    {
+        $response = "request error";
+        if ($this->request->hasPost("zone")) {
+            $zonename = $this->request->getPost("zone");
+            $backend = new Backend();
+            $response = json_decode($backend->configdpRun("bind zone show", [$zonename]), true);
+        }
+        return $response;
+    }
 }
diff --git a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
index 52929b3ef..5be009dac 100644
--- a/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
+++ b/dns/bind/src/opnsense/mvc/app/controllers/OPNsense/Bind/forms/general.xml
@@ -93,7 +93,14 @@
         <id>general.logsize</id>
         <label>Logsize in MB</label>
         <type>text</type>
-        <help>Set the amount how big a logfile can growth.</help>
+        <help>Set the amount how big a logfile can growth. For Query and Blocked logs.</help>
+    </field>
+    <field>
+        <id>general.general_log_level</id>
+        <label>General Log level</label>
+        <style>selectpicker</style>
+        <type>dropdown</type>
+        <help>Select General Log level. Log levels are listed in the order of increasing verbosity. Setting a certain log level will cause all messages of the specified and more severe log levels to be logged.</help>
     </field>
     <field>
         <id>general.maxcachesize</id>
diff --git a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
index 35e193df3..8ab42f3c6 100644
--- a/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
+++ b/dns/bind/src/opnsense/mvc/app/models/OPNsense/Bind/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/bind/general</mount>
     <description>BIND configuration</description>
-    <version>1.0.10</version>
+    <version>1.0.11</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -76,6 +76,20 @@
             <MaximumValue>1000</MaximumValue>
             <ValidationMessage>Choose a value between 1 and 1000.</ValidationMessage>
         </logsize>
+        <general_log_level type="OptionField">
+            <OptionValues>
+                <emerg value="emerg">Emergency</emerg>
+                <alert value="alert">Alert</alert>
+                <crit value="crit">Critical</crit>
+                <error value="error">Error</error>
+                <warn value="warn">Warning</warn>
+                <notice value="notice">Notice</notice>
+                <info value="info">Informational</info>
+                <debug value="debug">Debug</debug>
+            </OptionValues>
+            <Required>Y</Required>
+            <default>info</default>
+        </general_log_level>
         <maxcachesize type="IntegerField">
             <default>80</default>
             <Required>Y</Required>
diff --git a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
index e29bc6434..0649c0eb2 100644
--- a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
+++ b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/general.volt
@@ -53,28 +53,30 @@
         </div>
     </div>
     <div id="acls" class="tab-pane fade in">
-        <table id="grid-acls" class="table table-condensed table-hover table-striped table-responsive" data-editDialog="dialogEditBindAcl">
-            <thead>
-                <tr>
-                    <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                    <th data-column-id="name" data-type="string" data-visible="true">{{ lang._('Name') }}</th>
-                    <th data-column-id="networks" data-type="string" data-visible="true">{{ lang._('Networks') }}</th>
-                    <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
-                    <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="5"></td>
-                    <td>
-                        <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
-                        <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
+        <div id="acls-area" class="table-responsive">
+            <table id="grid-acls" class="table table-condensed table-hover table-striped" data-editDialog="dialogEditBindAcl">
+                <thead>
+                    <tr>
+                        <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
+                        <th data-column-id="name" data-type="string" data-visible="true">{{ lang._('Name') }}</th>
+                        <th data-column-id="networks" data-type="string" data-visible="true" data-css-class="long-str">{{ lang._('Networks') }}</th>
+                        <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
+                        <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td colspan="5"></td>
+                        <td>
+                            <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                            <button data-action="deleteSelected" type="button" class="btn btn-xs btn-default"><span class="fa fa-trash-o"></span></button>
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
+        </div>
         <div class="col-md-12">
             <hr />
             <button class="btn btn-primary" id="saveAct_acl" type="button"><b>{{ lang._('Save') }}</b> <i id="saveAct_acl_progress"></i></button>
@@ -85,44 +87,46 @@
         <div class="col-md-12">
             <h2>{{ lang._('Zones') }}</h2>
         </div>
-        <table id="grid-primary-domains" class="table table-condensed table-hover table-striped table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindPrimaryDomain">
-            <thead>
-                <tr>
-                    <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                    <th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
-                    <th data-column-id="ttl" data-type="string" data-visible="true">{{ lang._('TTL') }}</th>
-                    <th data-column-id="refresh" data-type="string" data-visible="true">{{ lang._('Refresh') }}</th>
-                    <th data-column-id="retry" data-type="string" data-visible="true">{{ lang._('Retry') }}</th>
-                    <th data-column-id="expire" data-type="string" data-visible="true">{{ lang._('Expire') }}</th>
-                    <th data-column-id="negative" data-type="string" data-visible="true">{{ lang._('Negative TTL') }}</th>
-                    <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
-                    <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="5"></td>
-                    <td>
-                        <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
+        <div id="primary-domains-area" class="table-responsive">
+            <table id="grid-primary-domains" class="table table-condensed table-hover table-striped" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindPrimaryDomain">
+                <thead>
+                    <tr>
+                        <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
+                        <th data-column-id="domainname" data-type="string" data-visible="true" data-css-class="zonename">{{ lang._('Zone') }}</th>
+                        <th data-column-id="ttl" data-type="string" data-visible="true">{{ lang._('TTL') }}</th>
+                        <th data-column-id="refresh" data-type="string" data-visible="true">{{ lang._('Refresh') }}</th>
+                        <th data-column-id="retry" data-type="string" data-visible="true">{{ lang._('Retry') }}</th>
+                        <th data-column-id="expire" data-type="string" data-visible="true">{{ lang._('Expire') }}</th>
+                        <th data-column-id="negative" data-type="string" data-visible="true">{{ lang._('Negative TTL') }}</th>
+                        <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
+                        <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td colspan="5"></td>
+                        <td>
+                            <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
+        </div>
         <hr/>
-        <div id="primary-record-area">
-            <div class="col-md-12">
-                <h2>{{ lang._('Records') }}</h2>
-            </div>
-            <table id="grid-primary-records" class="table table-condensed table-hover table-striped table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindRecord">
+        <div class="col-md-12">
+            <h2>{{ lang._('Records') }}</h2>
+        </div>
+        <div id="primary-record-area" class="table-responsive">
+            <table id="grid-primary-records" class="table table-condensed table-hover table-striped" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindRecord">
                 <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
                     <th data-column-id="domain" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
                     <th data-column-id="name" data-type="string" data-visible="true">{{ lang._('Name') }}</th>
                     <th data-column-id="type" data-type="string" data-visible="true">{{ lang._('Type') }}</th>
-                    <th data-column-id="value" data-type="string" data-visible="true">{{ lang._('Value') }}</th>
+                    <th data-column-id="value" data-type="string" data-visible="true" data-css-class="long-str">{{ lang._('Value') }}</th>
                     <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
                     <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
                 </tr>
@@ -153,27 +157,29 @@
         <div class="col-md-12">
             <h2>{{ lang._('Zones') }}</h2>
         </div>
-        <table id="grid-secondary-domains" class="table table-condensed table-hover table-striped table-responsive" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindSecondaryDomain">
-            <thead>
-                <tr>
-                    <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
-                    <th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
-                    <th data-column-id="primaryip" data-type="string" data-visible="true">{{ lang._('Primary IPs') }}</th>
-                    <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
-                    <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
-                </tr>
-            </thead>
-            <tbody>
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="5"></td>
-                    <td>
-                        <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
+        <div id="secondary-domains-area" class="table-responsive">
+            <table id="grid-secondary-domains" class="table table-condensed table-hover table-striped" data-editAlert="ChangeMessage" data-editDialog="dialogEditBindSecondaryDomain">
+                <thead>
+                    <tr>
+                        <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
+                        <th data-column-id="domainname" data-type="string" data-visible="true">{{ lang._('Zone') }}</th>
+                        <th data-column-id="primaryip" data-type="string" data-visible="true">{{ lang._('Primary IPs') }}</th>
+                        <th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
+                        <th data-column-id="commands" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td colspan="5"></td>
+                        <td>
+                            <button data-action="add" type="button" class="btn btn-xs btn-default"><span class="fa fa-plus"></span></button>
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
+        </div>
         <hr/>
         <div class="col-md-12">
             <div id="ChangeMessage" class="alert alert-info" style="display: none" role="alert">
@@ -190,50 +196,217 @@
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditBindSecondaryDomain,'id':'dialogEditBindSecondaryDomain','label':lang._('Edit Secondary Zone')])}}
 {{ partial("layout_partials/base_dialog",['fields':formDialogEditBindRecord,'id':'dialogEditBindRecord','label':lang._('Edit Record')])}}
 
+<style>
+    #zone-content {
+        overflow-x: auto;
+    }
+    #zone-table {
+        display: grid;
+        max-height: 400px;
+        overflow-y: auto;
+        white-space: pre-wrap;
+        word-break: break-word;
+        padding-right: 20px;
+    }
+    .l-number {
+        position: relative;
+        width: 1%;
+        min-width: 40px;
+        padding-right: 20px;
+        padding-left: 1px;
+        font-family: ui-monospace,monospace;
+        text-align: right;
+        white-space: nowrap;
+        vertical-align: top;
+        user-select: none;
+        filter: brightness(2.0);
+        filter: contrast(0.3);
+    }
+    .long-str {
+        word-break: break-word;
+    }
+    .copy-button {
+        display: none;
+    }
+</style>
 <script>
-$( document ).ready(function() {
-    let data_get_map = {'frm_general_settings':"/api/bind/general/get"};
-    mapDataToFormUI(data_get_map).done(function(data){
+function zone_test(zonename) {
+    let payload = {
+        'zone': zonename,
+    };
+    ajaxCall(url = "/api/bind/general/zonetest/", payload, callback = function(data, status) {
+        if (data['response'].indexOf('Zone check completed successfully') == -1) {
+            BootstrapDialog.show({
+                type: BootstrapDialog.TYPE_DANGER,
+                closeByBackdrop: false,
+                title: "{{ lang._('Primay zone check failed') }}",
+                message: data['response'],
+                buttons: [{
+                        label: "{{ lang._('Show zone content') }}",
+                        action: function(dlg) {
+                            $(this).closest(".modal-dialog").find("div.bootstrap-dialog-body").append('<div id="zone-wait">{{ lang._("Loading zone content..") }}<div>');
+                            zone_show(payload);
+                        },
+                    },
+                    {
+                        label: 'Ok',
+                        action: function(dlg) {
+                            dlg.close();
+                        },
+                    }
+                ]
+            });
+        } else {
+            BootstrapDialog.show({
+                type: BootstrapDialog.TYPE_INFO,
+                title: "{{ lang._('Zone check completed successfully') }}",
+                message: data['response'],
+                buttons: [{
+                        label: "{{ lang._('Show zone content') }}",
+                        action: function(dlg) {
+                            $(this).closest(".modal-dialog").find("div.bootstrap-dialog-body").append('<div id="zone-wait">{{ lang._("Loading zone content..") }}<div>');
+                            zone_show(payload);
+                        },
+                    },
+                    {
+                        label: 'Ok',
+                        action: function(dlg) {
+                            dlg.close();
+                        },
+                    }
+                ]
+            });
+        }
+    });
+}
+
+function zone_show(payload) {
+    ajaxCall(url = "/api/bind/general/zoneshow/", payload, callback = function(data, status) {
+        if (data['time'] && data['zone_content']) {
+            $("#zone-wait").remove();
+            let L = 0;
+            let content = [];
+            content.push('<tr><td class="l-number"></td><td class="conf-line">; zone file dump from ' + data['path'] + '</td></tr>');
+            content.push('<tr><td class="l-number"></td><td class="conf-line">; zone file created at ' + data['time'] + '</td></tr>');
+            $.each(data['zone_content'], function(index, line) {
+                L += 1;
+                content.push('<tr><td class="l-number">' + L.toString() + '</td><td class="conf-line">' + line + '</td></tr>');
+            });
+            BootstrapDialog.show({
+                type: BootstrapDialog.TYPE_INFO,
+                title: "{{ lang._('Zone loaded successfully') }}",
+                message: '<div id="zone-content"><table><tbody id="zone-table">' + content.join('') + '</tbody></table></div>',
+                onshown: function(dialogRef) {
+                    if ((typeof navigator.clipboard === 'object') && (typeof navigator.clipboard.writeText === 'function')) {
+                        $(".copy-button").show();
+                    }
+                },
+                buttons: [{
+                        label: '<i id="copy-progress" class="fa fa-spinner fa-pulse" style="display: none"></i> {{ lang._("Copy to clipboard") }}',
+                        cssClass: 'copy-button',
+                        action: function() {
+                            zone_copy();
+                        }
+                    },
+                    {
+                        label: 'Ok',
+                        action: function(dlg) {
+                            dlg.close();
+                        }
+                    }
+                ]
+            });
+        } else {
+            $("#zone-wait").text("{{ lang._('Empty response from the backend. Please check logs.') }}");
+        }
+    });
+}
+
+function zone_copy(dlg) {
+    $('#copy-progress').show();
+    let conf_to_clipboard = [];
+    $('.conf-line').each(function() {
+        conf_to_clipboard.push($(this).text())
+    });
+    navigator.clipboard.writeText(conf_to_clipboard.join('\n'));
+    setTimeout(() => {
+        $("#copy-progress").hide();
+    }, 1000);
+}
+
+$(document).ready(function() {
+    let data_get_map = {
+        'frm_general_settings': "/api/bind/general/get"
+    };
+    mapDataToFormUI(data_get_map).done(function(data) {
         formatTokenizersUI();
         $('.selectpicker').selectpicker('refresh');
     });
 
-    let data_get_map2 = {'frm_dnsbl_settings':"/api/bind/dnsbl/get"};
-    mapDataToFormUI(data_get_map2).done(function(data){
+    let data_get_map2 = {
+        'frm_dnsbl_settings': "/api/bind/dnsbl/get"
+    };
+    mapDataToFormUI(data_get_map2).done(function(data) {
         formatTokenizersUI();
         $('.selectpicker').selectpicker('refresh');
     });
 
     updateServiceControlUI('bind');
 
-    $("#grid-acls").UIBootgrid(
-        {   'search':'/api/bind/acl/searchAcl',
-            'get':'/api/bind/acl/getAcl/',
-            'set':'/api/bind/acl/setAcl/',
-            'add':'/api/bind/acl/addAcl/',
-            'del':'/api/bind/acl/delAcl/',
-            'toggle':'/api/bind/acl/toggleAcl/'
-        }
-    );
+    $("#grid-acls").UIBootgrid({
+        'search': '/api/bind/acl/searchAcl',
+        'get': '/api/bind/acl/getAcl/',
+        'set': '/api/bind/acl/setAcl/',
+        'add': '/api/bind/acl/addAcl/',
+        'del': '/api/bind/acl/delAcl/',
+        'toggle': '/api/bind/acl/toggleAcl/'
+    });
 
     $("#grid-primary-domains").UIBootgrid({
-        'search':'/api/bind/domain/searchPrimaryDomain',
-        'get':'/api/bind/domain/getDomain/',
-        'set':'/api/bind/domain/setDomain/',
-        'add':'/api/bind/domain/addPrimaryDomain/',
-        'del':'/api/bind/domain/delDomain/',
-        'toggle':'/api/bind/domain/toggleDomain/',
-        options:{
+        'search': '/api/bind/domain/searchPrimaryDomain',
+        'get': '/api/bind/domain/getDomain/',
+        'set': '/api/bind/domain/setDomain/',
+        'add': '/api/bind/domain/addPrimaryDomain/',
+        'del': '/api/bind/domain/delDomain/',
+        'toggle': '/api/bind/domain/toggleDomain/',
+        commands: {
+            'bind-checkzone': {
+                'title': "Check & preview",
+                'classname': "fa fa-fw fa-stethoscope  ",
+                'sequence': 300,
+            },
+        },
+        options: {
             selection: true,
             multiSelect: false,
             rowSelect: true,
-            rowCount: [3,7,14,20,50,100,-1]
+            rowCount: [3, 7, 14, 20, 50, 100, -1]
         }
     }).on("selected.rs.jquery.bootgrid", function(e, rows) {
         $("#grid-primary-records").bootgrid('reload');
     }).on("deselected.rs.jquery.bootgrid", function(e, rows) {
         $("#grid-primary-records").bootgrid('reload');
-    }).on("loaded.rs.jquery.bootgrid", function (e) {
+    }).on("loaded.rs.jquery.bootgrid", function(e) {
+        // Checkzone button
+        $("#grid-primary-domains").find(".command-bind-checkzone").off("click").on("click", function(ev) {
+            if (!$(this).closest("tr").hasClass("text-muted")) {
+                let zonename = $(this).closest('tr').find('td.zonename').text();
+                zone_test(zonename);
+            } else {
+                BootstrapDialog.show({
+                    type: BootstrapDialog.TYPE_DANGER,
+                    title: "{{ lang._('Error') }}",
+                    message: "{{ lang._('For zone Check and Show to work, the zone must be enabled and the configuration applied.') }}",
+                    buttons: [{
+                        label: 'Ok',
+                        action: function(dlg) {
+                            dlg.close();
+                        },
+                    }]
+                });
+            }
+        });
+
         let ids = $("#grid-primary-domains").bootgrid("getCurrentRows");
         if (ids.length > 0) {
             $("#grid-primary-domains").bootgrid('select', [ids[0].uuid]);
@@ -241,19 +414,19 @@ $( document ).ready(function() {
     });
 
     $("#grid-secondary-domains").UIBootgrid({
-        'search':'/api/bind/domain/searchSecondaryDomain',
-        'get':'/api/bind/domain/getDomain/',
-        'set':'/api/bind/domain/setDomain/',
-        'add':'/api/bind/domain/addSecondaryDomain/',
-        'del':'/api/bind/domain/delDomain/',
-        'toggle':'/api/bind/domain/toggleDomain/',
-        options:{
+        'search': '/api/bind/domain/searchSecondaryDomain',
+        'get': '/api/bind/domain/getDomain/',
+        'set': '/api/bind/domain/setDomain/',
+        'add': '/api/bind/domain/addSecondaryDomain/',
+        'del': '/api/bind/domain/delDomain/',
+        'toggle': '/api/bind/domain/toggleDomain/',
+        options: {
             selection: false,
             multiSelect: false,
             rowSelect: false,
-            rowCount: [7,14,20,50,100,-1]
+            rowCount: [7, 14, 20, 50, 100, -1]
         }
-    }).on("loaded.rs.jquery.bootgrid", function (e) {
+    }).on("loaded.rs.jquery.bootgrid", function(e) {
         let ids = $("#grid-secondary-domains").bootgrid("getCurrentRows");
         if (ids.length > 0) {
             $("#grid-secondary-domains").bootgrid('select', [ids[0].uuid]);
@@ -261,13 +434,13 @@ $( document ).ready(function() {
     });
 
     $("#grid-primary-records").UIBootgrid({
-        'search':'/api/bind/record/searchRecord',
-        'get':'/api/bind/record/getRecord/',
-        'set':'/api/bind/record/setRecord/',
-        'add':'/api/bind/record/addRecord/',
-        'del':'/api/bind/record/delRecord/',
-        'toggle':'/api/bind/record/toggleRecord/',
-        options:{
+        'search': '/api/bind/record/searchRecord',
+        'get': '/api/bind/record/getRecord/',
+        'set': '/api/bind/record/setRecord/',
+        'add': '/api/bind/record/addRecord/',
+        'del': '/api/bind/record/delRecord/',
+        'toggle': '/api/bind/record/toggleRecord/',
+        options: {
             useRequestHandlerOnGet: true,
             requestHandler: function(request) {
                 let ids = $("#grid-primary-domains").bootgrid("getSelectedRows");
@@ -287,21 +460,21 @@ $( document ).ready(function() {
         }
     });
 
-    $("#saveAct").click(function(){
-        saveFormToEndpoint(url="/api/bind/general/set", formid='frm_general_settings',callback_ok=function(){
-        $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
-            ajaxCall(url="/api/bind/service/reconfigure", sendData={}, callback=function(data,status) {
+    $("#saveAct").click(function() {
+        saveFormToEndpoint(url = "/api/bind/general/set", formid = 'frm_general_settings', callback_ok = function() {
+            $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
+            ajaxCall(url = "/api/bind/service/reconfigure", sendData = {}, callback = function(data, status) {
                 updateServiceControlUI('bind');
                 $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
             });
         });
     });
 
-    $("#saveAct_dnsbl").click(function(){
-        saveFormToEndpoint(url="/api/bind/dnsbl/set", formid='frm_dnsbl_settings',callback_ok=function(){
-        $("#saveAct_dnsbl_progress").addClass("fa fa-spinner fa-pulse");
-            ajaxCall(url="/api/bind/service/dnsbl", sendData={}, callback=function(data,status) {
-                ajaxCall(url="/api/bind/service/reconfigure", sendData={}, callback=function(data,status) {
+    $("#saveAct_dnsbl").click(function() {
+        saveFormToEndpoint(url = "/api/bind/dnsbl/set", formid = 'frm_dnsbl_settings', callback_ok = function() {
+            $("#saveAct_dnsbl_progress").addClass("fa fa-spinner fa-pulse");
+            ajaxCall(url = "/api/bind/service/dnsbl", sendData = {}, callback = function(data, status) {
+                ajaxCall(url = "/api/bind/service/reconfigure", sendData = {}, callback = function(data, status) {
                     updateServiceControlUI('bind');
                     $("#saveAct_dnsbl_progress").removeClass("fa fa-spinner fa-pulse");
                 });
@@ -309,19 +482,19 @@ $( document ).ready(function() {
         });
     });
 
-    $("#saveAct_acl").click(function(){
-        saveFormToEndpoint(url="/api/bind/acl/set", formid='frm_general_settings',callback_ok=function(){
+    $("#saveAct_acl").click(function() {
+        saveFormToEndpoint(url = "/api/bind/acl/set", formid = 'frm_general_settings', callback_ok = function() {
             $("#saveAct_acl_progress").addClass("fa fa-spinner fa-pulse");
-            ajaxCall(url="/api/bind/service/reconfigure", sendData={}, callback=function(data,status) {
+            ajaxCall(url = "/api/bind/service/reconfigure", sendData = {}, callback = function(data, status) {
                 updateServiceControlUI('bind');
                 $("#saveAct_acl_progress").removeClass("fa fa-spinner fa-pulse");
             });
         });
     });
 
-    $(".saveAct_domain").click(function(){
+    $(".saveAct_domain").click(function() {
         $(".saveAct_domain_progress").addClass("fa fa-spinner fa-pulse");
-        ajaxCall("/api/bind/service/reconfigure", {}, function(data,status) {
+        ajaxCall("/api/bind/service/reconfigure", {}, function(data, status) {
             updateServiceControlUI('bind');
             $(".saveAct_domain_progress").removeClass("fa fa-spinner fa-pulse");
         });
@@ -336,10 +509,10 @@ $( document ).ready(function() {
     });
 
     // update history on tab state and implement navigation
-    if(window.location.hash != "") {
+    if (window.location.hash != "") {
         $('a[href="' + window.location.hash + '"]').click()
     }
-    $('.nav-tabs a').on('shown.bs.tab', function (e) {
+    $('.nav-tabs a').on('shown.bs.tab', function(e) {
         history.pushState(null, null, e.target.hash);
     });
 });
diff --git a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/logs.volt b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/logs.volt
index 33f044215..e50125f61 100644
--- a/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/logs.volt
+++ b/dns/bind/src/opnsense/mvc/app/views/OPNsense/Bind/logs.volt
@@ -27,16 +27,6 @@
 
 <script>
     $( document ).ready(function() {
-      // get entries from named/named.log
-      let grid_generallog = $("#grid-generallog").UIBootgrid({
-          options:{
-              sorting:false,
-              rowSelect: false,
-              selection: false,
-              rowCount:[20,50,100,200,500,1000,-1],
-          },
-          search:'/api/diagnostics/log/named/named'
-      });
 
       // get entries from named/query.log
       let grid_querylog = $("#grid-querylog").UIBootgrid({
@@ -60,19 +50,6 @@
           search:'/api/diagnostics/log/named/rpz'
       });
 
-      grid_generallog.on("loaded.rs.jquery.bootgrid", function(){
-          $(".action-page").click(function(event){
-              event.preventDefault();
-              $("#grid-generallog").bootgrid("search",  "");
-              let new_page = parseInt((parseInt($(this).data('row-id')) / $("#grid-log").bootgrid("getRowCount")))+1;
-              $("input.search-field").val("");
-              // XXX: a bit ugly, but clearing the filter triggers a load event.
-              setTimeout(function(){
-                  $("ul.pagination > li:last > a").data('page', new_page).click();
-              }, 100);
-          });
-      });
-
       grid_querylog.on("loaded.rs.jquery.bootgrid", function(){
           $(".action-page").click(function(event){
               event.preventDefault();
@@ -112,22 +89,7 @@
 <div class="content-box tab-content">
 
     <div id="generallog" class="tab-pane fade in active">
-        <div class="content-box" style="padding-bottom: 1.5em;">
-            <div  class="col-sm-12">
-                <table id="grid-generallog" class="table table-condensed table-hover table-striped table-responsive" data-store-selection="true">
-                    <thead>
-                    <tr>
-                        <th data-column-id="timestamp" data-width="15em" data-type="string">{{ lang._('Date') }}</th>
-                        <th data-column-id="process_name" data-width="9em" data-type="string">{{ lang._('Type') }}</th>
-                        <th data-column-id="severity" data-width="11em" data-type="string">{{ lang._('Level')}}</th>
-                        <th data-column-id="line" data-type="string">{{ lang._('Line') }}</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-        </div>
+        {{ partial("OPNsense/Diagnostics/log",['module':'core','scope':'named'])}}
     </div>
 
     <div id="querylog" class="tab-pane fade">
@@ -169,5 +131,4 @@
             </div>
         </div>
     </div>
-
 </div>
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneCheck.sh b/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneCheck.sh
new file mode 100644
index 000000000..db3e85dac
--- /dev/null
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneCheck.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# check the primary zone file validity
+
+ZONENAME=${1}
+ZONEPATH="/usr/local/etc/namedb/primary/${ZONENAME}.db"
+if checkzone_errors=$(named-checkzone ${ZONENAME} ${ZONEPATH} 2>&1); then
+    echo "Zone check completed successfully"
+    echo "$checkzone_errors"
+else
+    echo "$checkzone_errors"
+fi
+
+exit 0
diff --git a/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneShow.py b/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneShow.py
new file mode 100644
index 000000000..38af91d4d
--- /dev/null
+++ b/dns/bind/src/opnsense/scripts/OPNsense/Bind/zoneShow.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+
+# send primary zone file content to stdout
+
+import sys
+import os.path
+import glob
+import ujson
+
+zone_name = sys.argv[1]
+result = dict()
+zone_config = []
+zone_files_root = '/usr/local/etc/namedb/primary/'
+zone_file = zone_files_root + zone_name + '.db'
+
+def load_db_file(zone_file):
+    """ load db-file
+    """
+    for line in open(zone_file, 'r').read().split('\n'):
+        zone_config.append(line.rstrip())
+
+if os.path.isfile(zone_file):
+    result['path'] = zone_file
+    result['time'] = os.path.getmtime(zone_file)
+    load_db_file(zone_file)
+    result['zone_content'] = zone_config
+print(ujson.dumps(result))
diff --git a/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf b/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
index d4f93e257..c3d4a47a5 100644
--- a/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
+++ b/dns/bind/src/opnsense/service/conf/actions.d/actions_bind.conf
@@ -40,3 +40,13 @@ parameters:
 type:script
 message:fetching DNSBLs and restart
 description: Download BIND DNSBLs and restart
+
+[zone.check]
+command:/usr/local/opnsense/scripts/OPNsense/Bind/zoneCheck.sh
+parameters: %s
+type:script_output
+
+[zone.show]
+command:/usr/local/opnsense/scripts/OPNsense/Bind/zoneShow.py
+parameters: %s
+type:script_output
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
index b92aaf6d5..d6cf8515c 100644
--- a/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Bind/named.conf
@@ -201,6 +201,14 @@ logging {
                 print-category yes;
         };
 
+        channel default_syslog {
+                print-time yes;
+                print-category yes;
+                print-severity yes;
+                syslog daemon;
+                severity {% if helpers.exists('OPNsense.bind.general.general_log_level') %}{{ OPNsense.bind.general.general_log_level }}{% else %}info{% endif %};
+        };
+
         channel query_log {
                 file "/var/log/named/query.log" versions 3 size {{ OPNsense.bind.general.logsize }}m;
                 print-time yes;
@@ -211,8 +219,11 @@ logging {
                 print-time yes;
         };
 
-        category default { default_log; };
-        category general { default_log; };
+        category default { default_syslog; };
+        category general { default_syslog; };
+        category config { default_syslog; };
+        category dispatch { default_syslog; };
+        category network { default_syslog; };
         category queries { query_log; };
         category rpz { rpz_log; };
         category lame-servers { null; };
diff --git a/dns/bind/src/opnsense/service/templates/OPNsense/Syslog/local/named.conf b/dns/bind/src/opnsense/service/templates/OPNsense/Syslog/local/named.conf
new file mode 100644
index 000000000..d301237e4
--- /dev/null
+++ b/dns/bind/src/opnsense/service/templates/OPNsense/Syslog/local/named.conf
@@ -0,0 +1,6 @@
+###################################################################
+# Local syslog-ng configuration filter definition [named].
+###################################################################
+filter f_local_named {
+    program("named");
+};