diff --git a/plist b/plist
index 1236ec8d9..3bfbf99bc 100644
--- a/plist
+++ b/plist
@@ -454,6 +454,8 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/Migrations/M1_0_0.php
diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index be6676e79..fe2b5642e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -265,7 +265,6 @@
             <Status order="40" url="/status_ntpd.php"/>
             <Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
         </NTP>
-        <SNMP url="/services_snmp.php" cssClass="fa fa-database fa-fw"/>
         <WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off fa-fw">
             <WoLEdit url="/services_wol_edit.php*" visibility="hidden"/>
             <Wol url="/services_wol.php*" visibility="hidden"/>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
index cb2743197..2e5fa7709 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
@@ -700,13 +700,6 @@
             "services_router_advertisements.php*"
         ]
     },
-    "page-services-snmp": {
-        "name": "WebCfg - Services: SNMP page",
-        "descr": "Allow access to the 'Services: SNMP' page.",
-        "match": [
-            "services_snmp.php*"
-        ]
-    },
     "page-services-wakeonlan": {
         "name": "WebCfg - Services: Wake on LAN page",
         "descr": "Allow access to the 'Services: Wake on LAN' page.",
diff --git a/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
new file mode 100644
index 000000000..c63641ef8
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
@@ -0,0 +1,9 @@
+<acl>
+    <page-services-snmp>
+        <name>WebCfg - Services: SNMP page</name>
+        <description>Allow access to the 'Services: SNMP' page.</description>
+        <patterns>
+            <pattern>services_snmp.php*</pattern>
+        </patterns>
+    </page-services-snmp>
+</acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
new file mode 100644
index 000000000..873f544c1
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
@@ -0,0 +1,5 @@
+<menu>
+    <Services>
+        <SNMP url="/services_snmp.php" cssClass="fa fa-database fa-fw"/>
+    </Services>
+</menu>