diff --git a/net/frr/Makefile b/net/frr/Makefile
index f107421c0..69b1b0e23 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.17
+PLUGIN_VERSION=		1.18
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7 ruby
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index 0523621f5..76a1e094e 100644
--- a/net/frr/pkg-descr
+++ b/net/frr/pkg-descr
@@ -11,6 +11,10 @@ switching and routing, Internet access routers, and Internet peering.
 Plugin Changelog
 ================
 
+1.18
+
+* Add description fields to BGP tabs
+
 1.17
 
 * Fix templating for BGP AS-Path Lists (by Steve Buzonas)
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
index 033d494c2..27a9278dc 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/BgpController.php
@@ -44,6 +44,7 @@ class BgpController extends ApiMutableModelControllerBase
         return $this->searchBase(
             'neighbors.neighbor',
             array("enabled",
+                  "description",
                   "address",
                   "remoteas",
                   "updatesource",
@@ -82,7 +83,7 @@ class BgpController extends ApiMutableModelControllerBase
     {
         return $this->searchBase(
             'aspaths.aspath',
-            array("enabled", "number", "action", "as" )
+            array("enabled", "description", "number", "action", "as" )
         );
     }
 
@@ -111,7 +112,7 @@ class BgpController extends ApiMutableModelControllerBase
     {
         return $this->searchBase(
             'prefixlists.prefixlist',
-            array("enabled", "name", "seqnumber", "action", "network" )
+            array("enabled", "description", "name", "seqnumber", "action", "network" )
         );
     }
     public function getPrefixlistAction($uuid = null)
@@ -139,7 +140,7 @@ class BgpController extends ApiMutableModelControllerBase
     {
         return $this->searchBase(
             'routemaps.routemap',
-            array("enabled", "name", "action", "id", "match", "match2", "set")
+            array("enabled", "description", "name", "action", "id", "match", "match2", "set")
         );
     }
 
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPASPath.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPASPath.xml
index d195d6081..f68295e77 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPASPath.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPASPath.xml
@@ -5,6 +5,12 @@
     <type>checkbox</type>
     <help>Enable / Disable</help>
   </field>
+  <field>
+    <id>aspath.description</id>
+    <label>Description</label>
+    <type>text</type>
+    <help>Add an optional description for this AS-Path list.</help>
+  </field>
   <field>
     <id>aspath.number</id>
     <label>Number</label>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
index 255a644db..6476f9ee9 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
@@ -4,6 +4,12 @@
     <label>Enabled</label>
     <type>checkbox</type>
   </field>
+  <field>
+    <id>neighbor.description</id>
+    <label>Description</label>
+    <type>text</type>
+    <help>Set an optional description for this neighbor.</help>
+  </field>
   <field>
     <id>neighbor.address</id>
     <label>Peer-IP</label>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPrefixLists.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPrefixLists.xml
index a919f082f..115e015de 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPrefixLists.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPPrefixLists.xml
@@ -4,6 +4,12 @@
     <label>Enabled</label>
     <type>checkbox</type>
     <help>Enable / Disable</help>
+  </field>
+    <field>
+    <id>prefixlist.description</id>
+    <label>Description</label>
+    <type>text</type>
+    <help>Add an optional description for this Prefix-List.</help>
   </field>
   <field>
     <id>prefixlist.name</id>
diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
index bd4e8380f..31fe3b5c6 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPRouteMaps.xml
@@ -5,6 +5,12 @@
     <type>checkbox</type>
     <help>Enable / Disable</help>
   </field>
+  <field>
+    <id>routemap.description</id>
+    <label>Description</label>
+    <type>text</type>
+    <help>Add an optional description for this route-map.</help>
+  </field>
   <field>
     <id>routemap.name</id>
     <label>Name</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
index eb30efc70..4d11fa76d 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/quagga/bgp</mount>
     <description>BGP Routing configuration</description>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -39,6 +39,10 @@
                                 <default>1</default>
                                 <Required>Y</Required>
                         </enabled>
+                        <description type="TextField">
+                                <default></default>
+                                <Required>N</Required>
+                        </description>
                         <address type="NetworkField">
                                 <default></default>
                                 <Required>Y</Required>
@@ -130,6 +134,10 @@
                                 <default>1</default>
                                 <Required>Y</Required>
                         </enabled>
+                        <description type="TextField">
+                                <default></default>
+                                <Required>N</Required>
+                        </description>
                         <number type="IntegerField">
                                 <default></default>
                                 <Required>Y</Required>
@@ -156,6 +164,10 @@
                                 <default>1</default>
                                 <Required>Y</Required>
                         </enabled>
+                        <description type="TextField">
+                                <default></default>
+                                <Required>N</Required>
+                        </description>
                         <name type="TextField">
                                 <default></default>
                                 <Required>Y</Required>
@@ -196,6 +208,10 @@
                                 <default>1</default>
                                 <Required>Y</Required>
                         </enabled>
+                        <description type="TextField">
+                                <default></default>
+                                <Required>N</Required>
+                        </description>
                         <name type="TextField">
                                 <default></default>
                                 <Required>Y</Required>
diff --git a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
index 397a799fb..635b21985 100644
--- a/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
+++ b/net/frr/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt
@@ -50,12 +50,9 @@ POSSIBILITY OF SUCH DAMAGE.
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
+                    <th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
                     <th data-column-id="address" data-type="string" data-visible="true">{{ lang._('Neighbor Address') }}</th>
                     <th data-column-id="remoteas" data-type="string" data-visible="true">{{ lang._('Remote AS') }}</th>
-                    <th data-column-id="updatesource" data-type="string" data-visible="true">{{ lang._('Update Source Address') }}</th>
-                    <th data-column-id="nexthopself" data-type="string" data-formatter="rowtoggle">{{ lang._('Next Hop Self') }}</th>
-                    <th data-column-id="multihop" data-type="string" data-formatter="rowtoggle">{{ lang._('Multi Hop') }}</th>
-                    <th data-column-id="defaultoriginate" data-type="string" data-formatter="rowtoggle">{{ lang._('Default Originate') }}</th>
                     <th data-column-id="linkedPrefixlistIn" data-type="string" data-visible="true">{{ lang._('Prefix List inbound') }}</th>
                     <th data-column-id="linkedPrefixlistOut" data-type="string" data-visible="true">{{ lang._('Prefix List outbound') }}</th>
                     <th data-column-id="linkedRoutemapIn" data-type="string" data-visible="true">{{ lang._('Route Map inbound') }}</th>
@@ -83,6 +80,7 @@ POSSIBILITY OF SUCH DAMAGE.
             <thead>
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle" data-sortable="false">{{ lang._('Enabled') }}</th>
+                    <th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
                     <th data-column-id="number" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Number') }}</th>
                     <th data-column-id="action" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Action') }}</th>
                     <th data-column-id="as" data-type="string" data-visible="true" data-sortable="false">{{ lang._('AS Number') }}</th>
@@ -110,6 +108,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 <tr>
                     <th data-column-id="enabled" data-type="string" data-formatter="rowtoggle" data-sortable="false">{{ lang._('Enabled') }}</th>
                     <th data-column-id="name" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Name') }}</th>
+                    <th data-column-id="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
                     <th data-column-id="seqnumber" data-type="string" data-visible="true" data-sortable="true">{{ lang._('Secquence Number') }}</th>
                     <th data-column-id="action" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Action') }}</th>
                     <th data-column-id="network" data-type="string" data-visible="true" data-sortable="false">{{ lang._('Network') }}</th>
@@ -137,6 +136,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 <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="description" data-type="string" data-visible="true">{{ lang._('Description') }}</th>
                     <th data-column-id="action" data-type="string" data-visible="true">{{ lang._('Action') }}</th>
                     <th data-column-id="id" data-type="string" data-visible="true">{{ lang._('ID') }}</th>
                     <th data-column-id="match" data-type="string" data-visible="true">{{ lang._('AS Path List') }}</th>