diff --git a/net/frr/Makefile b/net/frr/Makefile
index 2b73a8a55..98b32bbef 100644
--- a/net/frr/Makefile
+++ b/net/frr/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		frr
-PLUGIN_VERSION=		1.22
-PLUGIN_REVISION=    1
+PLUGIN_VERSION=		1.23
 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 3fb961354..829df3bb5 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.23
+
+* Add route-reflector-client to BGP neighbor config
+
 1.22
 
 * Add BFD support
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 649062d39..3ae8d6830 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
@@ -38,6 +38,11 @@
     <label>Multi-Hop</label>
     <type>checkbox</type>
   </field>
+  <field>
+    <id>neighbor.rrclient</id>
+    <label>Route Reflector Client</label>
+    <type>checkbox</type>
+  </field>
   <field>
     <id>neighbor.bfd</id>
     <label>BFD</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 b657eba87..767e8d008 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
@@ -74,6 +74,10 @@
                                 <default>0</default>
                                 <Required>N</Required>
                         </multihop>
+                        <rrclient type="BooleanField">
+                                <default>0</default>
+                                <Required>N</Required>
+                        </rrclient>
                         <bfd 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 c78857453..2505bb113 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -67,6 +67,9 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%         if 'nexthopself' in neighbor and neighbor.nexthopself == '1' %}
   neighbor {{ neighbor.address }} next-hop-self
 {%         endif %}
+{%         if 'rrclient' in neighbor and neighbor.rrclient == '1' %}
+  neighbor {{ neighbor.address }} route-reflector-client
+{%         endif %}
 {%         if 'defaultoriginate' in neighbor and neighbor.defaultoriginate == '1' %}
   neighbor {{ neighbor.address }} default-originate
 {%         endif %}
@@ -134,6 +137,9 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%         if 'nexthopself' in neighbor and neighbor.nexthopself == '1' %}
   neighbor {{ neighbor.address }} next-hop-self
 {%         endif %}
+{%         if 'rrclient' in neighbor and neighbor.rrclient == '1' %}
+  neighbor {{ neighbor.address }} route-reflector-client
+{%         endif %}
 {%         if 'defaultoriginate' in neighbor and neighbor.defaultoriginate == '1' %}
   neighbor {{ neighbor.address }} default-originate
 {%         endif %}