diff --git a/net/frr/Makefile b/net/frr/Makefile
index 74ddf6e95..1ccdf2d16 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.24
+PLUGIN_VERSION=		1.25
 PLUGIN_COMMENT=		The FRRouting Protocol Suite
 PLUGIN_DEPENDS=		frr7
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/net/frr/pkg-descr b/net/frr/pkg-descr
index dbaaf95e1..f2a1fa87e 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.25
+
+* Add "All" option to next-hop-self command (#2673)
+
 1.24
 
 * Add AS-Override (#2517)
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 089c15faf..d9f7f012d 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
@@ -40,6 +40,12 @@
     <label>Next-Hop-Self</label>
     <type>checkbox</type>
   </field>
+  <field>
+    <id>neighbor.nexthopselfall</id>
+    <label>Next-Hop-Self All</label>
+    <type>checkbox</type>
+    <help>Add the parameter "all" after next-hop-self command.</help>
+  </field>
   <field>
     <id>neighbor.multihop</id>
     <label>Multi-Hop</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 76dbc3ec9..3a052bd4e 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.5</version>
+    <version>1.0.6</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -79,6 +79,10 @@
                                 <default>0</default>
                                 <Required>N</Required>
                         </nexthopself>
+                        <nexthopselfall type="BooleanField">
+                                <default>0</default>
+                                <Required>N</Required>
+                        </nexthopselfall>
                         <multihop type="BooleanField">
                                 <default>0</default>
                                 <Required>N</Required>
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
index a9c4b993e..3f43144fd 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -91,7 +91,8 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%   for neighbor in neighbors[addressFamily] %}
   neighbor {{ neighbor.address }} activate
 {%     if 'nexthopself' in neighbor and neighbor.nexthopself == '1' %}
-  neighbor {{ neighbor.address }} next-hop-self
+  neighbor {{ neighbor.address }} next-hop-self {% if 'nexthopselfall' in neighbor and neighbor.nexthopselfall == '1' %}all{%  endif %}
+
 {%     endif %}
 {%     if 'rrclient' in neighbor and neighbor.rrclient == '1' %}
   neighbor {{ neighbor.address }} route-reflector-client