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 68fb8c75b..8eb6bd129 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
@@ -52,6 +52,7 @@ class BgpController extends ApiMutableModelControllerBase
                   "holddown",
                   "connecttimer",
                   "defaultoriginate",
+                  "asoverride",
                   "linkedPrefixlistIn",
                   "linkedPrefixlistOut",
                   "linkedRoutemapIn",
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 f494060aa..0171233fe 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
@@ -89,6 +89,12 @@
     <label>Send Defaultroute</label>
     <type>checkbox</type>
   </field>
+  <field>
+    <id>neighbor.asoverride</id>
+    <label>Enable As-Override</label>
+    <type>checkbox</type>
+	<help>Override AS number of the originating router with the local AS number. This command is only allowed for eBGP peers.</help>
+  </field>
   <field>
     <id>neighbor.linkedPrefixlistIn</id>
     <label>Prefix-List In</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 cc5b2782b..76dbc3ec9 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
@@ -114,6 +114,10 @@
                                 <default>0</default>
                                 <Required>N</Required>
                         </defaultoriginate>
+                        <asoverride type="BooleanField">
+                                <default>0</default>
+                                <Required>N</Required>
+                        </asoverride>
                         <linkedPrefixlistIn type="ModelRelationField">
                                 <Model>
                                         <template>
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 e0a9b8d5c..a9c4b993e 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -99,6 +99,9 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
 {%     if 'defaultoriginate' in neighbor and neighbor.defaultoriginate == '1' %}
   neighbor {{ neighbor.address }} default-originate
 {%     endif %}
+{%     if 'asoverride' in neighbor and neighbor.asoverride == '1' %}
+  neighbor {{ neighbor.address }} as-override
+{%         endif %}
 {%     if neighbor.linkedPrefixlistIn|default("") != "" %}
 {%       for prefixlist in neighbor.linkedPrefixlistIn.split(",") %}
 {%         set prefixlist2_data = helpers.getUUID(prefixlist) %}