diff --git a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
index 926afe40f..fc3d304c3 100644
--- a/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
+++ b/net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/general.xml
@@ -18,6 +18,12 @@
         <type>checkbox</type>
         <help>This will activate the routing service only on the master device.</help>
     </field>
+    <field>
+        <id>general.enablesnmp</id>
+        <label>Enable SNMP AgentX Support</label>
+        <type>checkbox</type>
+        <help>This will activate support for Net-SNMP AgentX.</help>
+    </field>
     <field>
         <id>general.enablesyslog</id>
         <label>Enable logging</label>
diff --git a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
index de9a496bd..cc0b58304 100644
--- a/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
+++ b/net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/General.xml
@@ -24,6 +24,10 @@
             <default>1</default>
             <Required>Y</Required>
         </enablesyslog>
+        <enablesnmp type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </enablesnmp>
         <sysloglevel type="OptionField">
             <Required>Y</Required>
             <multiple>N</multiple>
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 4bd7d7ef6..bd2d0e3b3 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/bgpd.conf
@@ -241,6 +241,10 @@ route-map {{ routemap.name }} {{ routemap.action }} {{ routemap.id }}
 !
 {% endif %}
 !
+{% if helpers.exists('OPNsense.quagga.bgpd.enabled') and OPNsense.quagga.general.enablesnmp == '1' %}
+agentx
+{% endif %}
+!
 line vty
 !
 {% endif %}
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
index 2163fb73a..9c8ee8525 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr
@@ -17,3 +17,9 @@ start_postcmd="/usr/local/opnsense/scripts/frr/carp_event_handler"
 {% else %}
 frr_enable="NO"
 {% endif %}
+{% if OPNsense.quagga.general.enablesnmp == '1' %}
+zebra_flags="${zebra_flags} -M snmp"
+bgpd_flags="${bgpd_flags} -M snmp"
+ospf_flags="${ospf_flags} -M snmp"
+ospf6_flags="${ospf6_flags} -M snmp"
+{% endif %}
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
index 603950f66..92fb578d9 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospf6d.conf
@@ -14,6 +14,9 @@ log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   if helpers.exists('OPNsense.quagga.general.profile') %}
 frr defaults {{ OPNsense.quagga.general.profile }}
 {%   endif %}
+{%   if OPNsense.quagga.general.enablesnmp == '1' %}
+agentx
+{%   endif %}
 {% endif %}
 !
 !
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
index dda33b080..350f4925c 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
@@ -14,6 +14,9 @@ log syslog {{ OPNsense.quagga.general.sysloglevel }}
 {%   if helpers.exists('OPNsense.quagga.general.profile') %}
 frr defaults {{ OPNsense.quagga.general.profile }}
 {%   endif %}
+{%   if OPNsense.quagga.general.enablesnmp == '1' %}
+agentx
+{%   endif %}
 {% endif %}
 !
 !
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
index 06de1506b..fbc685f72 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/zebra.conf
@@ -13,6 +13,12 @@ log syslog {{ OPNsense.quagga.general.sysloglevel }}
 !
 !
 !
+!
+{% if OPNsense.quagga.general.enablesnmp == '1' %}
+agentx
+{% endif %}
+!
+!
 ip forwarding
 ipv6 forwarding
 !