diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
new file mode 100644
index 000000000..955175e34
--- /dev/null
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ *    Copyright (C) 2016 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.
+ *
+ */
+
+
+namespace OPNsense\Diagnostics\Api;
+
+use \OPNsense\Base\ApiControllerBase;
+use \OPNsense\Core\Config;
+use \OPNsense\Core\Backend;
+
+/**
+ * Class InterfaceController
+ * @package OPNsense\SystemHealth
+ */
+class InterfaceController extends ApiControllerBase
+{
+    /**
+     * retrieve system arp table contents
+     * @return array
+     */
+    public function getArpAction()
+    {
+        $backend = new Backend();
+        $response = $backend->configdpRun("interface list arp json");
+        $arptable = json_decode($response, true);
+
+        // collect interface names
+        $intfmap = array();
+        $config = Config::getInstance()->object() ;
+        if ($config->interfaces != null) {
+            foreach ($config->interfaces->children() as $key => $node) {
+                $intfmap[(string)$node->if] = !empty((string)$node->descr) ? (string)$node->descr : $key ;
+            }
+        }
+        // merge arp output with interface names
+        if (is_array($arptable)) {
+            foreach ($arptable as &$arpentry) {
+                if (array_key_exists($arpentry['intf'], $intfmap)) {
+                    $arpentry['intf_description'] = $intfmap[$arpentry['intf']];
+                } else {
+                    $arpentry['intf_description'] = "";
+                }
+            }
+        }
+
+        return $arptable;
+    }
+}
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
new file mode 100644
index 000000000..ea9e9adf9
--- /dev/null
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ *    Copyright (C) 2016 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.
+ *
+ */
+namespace OPNsense\Diagnostics;
+
+use OPNsense\Base\IndexController;
+
+/**
+ * Class InterfaceController
+ * @package OPNsense\Proxy
+ */
+class InterfaceController extends IndexController
+{
+    public function arpAction()
+    {
+        $this->view->title = "System ARP table";
+        $this->view->pick('OPNsense/Diagnostics/arp');
+    }
+}
diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt
new file mode 100644
index 000000000..943f580c2
--- /dev/null
+++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt
@@ -0,0 +1,109 @@
+{#
+
+OPNsense® is Copyright © 2014 – 2016 by 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.
+
+#}
+
+<script type="text/javascript">
+    $( document ).ready(function() {
+        /**
+         * fetch system arp table
+         */
+        function updateARP() {
+            var gridopt = {
+                ajax: false,
+                selection: false,
+                multiSelect: false
+            };
+            $("#grid-arp").bootgrid('destroy');
+            ajaxGet(url = "/api/diagnostics/interface/getArp",
+                    sendData = {}, callback = function (data, status) {
+                        if (status == "success") {
+                            $("#grid-arp > tbody").html('');
+                            $.each(data, function (key, value) {
+                                var fields = ["ip", "mac", "manufacturer", "intf", "intf_description", "hostname"];
+                                tr_str = '<tr>';
+                                for (var i = 0; i < fields.length; i++) {
+                                    if (value[fields[i]] != null) {
+                                        tr_str += '<td>' + value[fields[i]] + '</td>';
+                                    } else {
+                                        tr_str += '<td></td>';
+                                    }
+                                }
+                                tr_str += '</tr>';
+                                $("#grid-arp > tbody").append(tr_str);
+                            });
+                        }
+                        $("#grid-arp").bootgrid(gridopt);
+                    }
+            );
+        }
+
+        // initial fetch
+        $("#refresh").click(updateARP);
+        $("#refresh").click();
+    });
+</script>
+
+<div class="content-box">
+    <div class="content-box-main">
+        <div class="table-responsive">
+            <div  class="col-sm-12">
+                <table id="grid-arp" class="table table-condensed table-hover table-striped table-responsive">
+                    <thead>
+                    <tr>
+                        <th data-column-id="ip" data-type="string" >{{ lang._('IP') }}</th>
+                        <th data-column-id="mac" data-type="string" data-identifier="true">{{ lang._('MAC') }}</th>
+                        <th data-column-id="manufacturer" data-type="string" data-css-class="hidden-xs hidden-sm" data-header-css-class="hidden-xs hidden-sm">{{ lang._('Manufacturer') }}</th>
+                        <th data-column-id="intf" data-type="string" data-css-class="hidden-xs hidden-sm" data-header-css-class="hidden-xs hidden-sm">{{ lang._('Interface') }}</th>
+                        <th data-column-id="intf_description" data-type="string" data-css-class="hidden-xs hidden-sm" data-header-css-class="hidden-xs hidden-sm">{{ lang._('Interface name') }}</th>
+                        <th data-column-id="hostname" data-type="string" data-css-class="hidden-xs hidden-sm" data-header-css-class="hidden-xs hidden-sm">{{ lang._('Hostname') }}</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                    <tfoot>
+                    <tr>
+                        <td colspan="10">{{ lang._('NOTE: Local IPv6 peers use NDP instead of ARP.') }}</td>
+                    </tr>
+                    </tfoot>
+                </table>
+            </div>
+            <div  class="col-sm-12">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <div class="pull-right">
+                            <button id="refresh" type="button" class="btn btn-default">
+                                <span>{{ lang._('Refresh') }}</span>
+                                <span class="fa fa-refresh"></span>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <hr/>
+            </div>
+        </div>
+    </div>
+</div>