diff --git a/dns/rfc2136/Makefile b/dns/rfc2136/Makefile
index a62cfadea..3c0aa16e7 100644
--- a/dns/rfc2136/Makefile
+++ b/dns/rfc2136/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		rfc2136
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		RFC-2136 Support
 PLUGIN_MAINTAINER=	franco@opnsense.org
 PLUGIN_DEPENDS=		bind912
diff --git a/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php b/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php
index b16b89f9e..85fc43c0d 100644
--- a/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php
+++ b/dns/rfc2136/src/www/widgets/widgets/rfc2136.widget.php
@@ -1,33 +1,33 @@
 <?php
 
 /*
-    Copyright (C) 2017 Franco Fichtner <franco@opnsense.org>
-    Copyright (C) 2014-2016 Deciso B.V.
-    Copyright (C) 2008 Ermal Luçi
-    Copyright (C) 2013 Stanley P. Miller \ stan-qaz
-    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.
-*/
+ * Copyright (C) 2017 Franco Fichtner <franco@opnsense.org>
+ * Copyright (C) 2014-2016 Deciso B.V.
+ * Copyright (C) 2008 Ermal Luçi
+ * Copyright (C) 2013 Stanley P. Miller \ stan-qaz
+ * 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("guiconfig.inc");
 require_once("widgets/include/rfc2136.inc");
@@ -95,10 +95,10 @@ if (!empty($_REQUEST['getrfc2136status'])) {
 <table class="table table-striped table-condensed">
   <thead>
     <tr>
-      <th><?=gettext("Interface");?></th>
-      <th><?=gettext("Server");?></th>
-      <th><?=gettext("Hostname");?></th>
-      <th><?=gettext("Cached IP");?></th>
+      <th style="word-break:break-word;"><?=gettext("Interface");?></th>
+      <th style="word-break:break-word;"><?=gettext("Server");?></th>
+      <th style="word-break:break-word;"><?=gettext("Hostname");?></th>
+      <th style="word-break:break-word;"><?=gettext("Cached IP");?></th>
     </tr>
   </thead>
   <tbody>
@@ -107,7 +107,7 @@ if (!empty($_REQUEST['getrfc2136status'])) {
   $groupslist = return_gateway_groups_array();
   foreach ($a_rfc2136 as $i => $rfc2136) :?>
     <tr ondblclick="document.location='services_rfc2136_edit.php?id=<?=$i;?>'">
-      <td <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
+      <td style="word-break:break-word;" <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
 <?php
         foreach ($iflist as $if => $ifdesc) {
             if ($rfc2136['interface'] == $if) {
@@ -122,13 +122,13 @@ if (!empty($_REQUEST['getrfc2136status'])) {
             }
         }?>
       </td>
-      <td <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
+      <td style="word-break:break-word;" <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
         <?= htmlspecialchars($rfc2136['server']) ?>
       </td>
-      <td <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
+      <td style="word-break:break-word;" <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
         <?= htmlspecialchars($rfc2136['host']) ?>
       </td>
-      <td <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
+      <td style="word-break:break-word;" <?= isset($rfc2136['enable']) ? '' : 'class="text-muted"' ?>>
         <div id='rfc2136status<?=$i;?>'>
           <?= gettext('Checking...') ?>
         </div>