diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 77c00a3b9..133d1cf23 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		net-snmp
-PLUGIN_VERSION=		1.4
+PLUGIN_VERSION=		1.5
 PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		Net-SNMP is a daemon for the SNMP protocol
 PLUGIN_DEPENDS=		net-snmp
diff --git a/net-mgmt/net-snmp/pkg-descr b/net-mgmt/net-snmp/pkg-descr
index c2f08d0ba..c61e6d62d 100644
--- a/net-mgmt/net-snmp/pkg-descr
+++ b/net-mgmt/net-snmp/pkg-descr
@@ -11,6 +11,10 @@ WWW: http://www.net-snmp.org
 Plugin Changelog
 ----------------
 
+1.5
+
+* Add support for agentx.
+
 1.4
 
 * Include installed version number in extended OID
diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
index 46df7feb7..114b0761a 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
@@ -23,6 +23,12 @@
         <type>text</type>
         <help>Set the contact address to use.</help>
     </field>
+    <field>
+        <id>general.enableagentx</id>
+        <label>Add AgentX Support</label>
+        <type>checkbox</type>
+        <help>Enable support for AgentX Application (FRR, others).</help>
+    </field>
     <field>
         <id>general.l3visibility</id>
         <label>Layer 3 Visibility</label>
diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
index fe2bbb7e1..911568aab 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/netsnmp/general</mount>
     <description>Netsnmp configuration</description>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -27,6 +27,10 @@
             <default>0</default>
             <Required>Y</Required>
         </versionoid>
+        <enableagentx type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </enableagentx>
         <listen type="NetworkField">
             <FieldSeparator>,</FieldSeparator>
             <Required>N</Required>
diff --git a/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf b/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
index 1afbeaad8..a04c0a182 100644
--- a/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
+++ b/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
@@ -12,6 +12,11 @@ agentAddress udp6:[{{ network }}]:161
 agentAddress udp:161,udp6:[::1]:161
 {% endif %}
 
+{% if OPNsense.netsnmp.general.enableagentx == '1' %}
+master agentx
+agentxsocket /var/agentx/master
+agentxperms 777 777
+{% endif %}
 
 {% if helpers.exists('OPNsense.netsnmp.general.community') and OPNsense.netsnmp.general.community != '' %}
 rocommunity {{ OPNsense.netsnmp.general.community }}