diff --git a/plist b/plist
index 18d00d4af..ec189c317 100644
--- a/plist
+++ b/plist
@@ -450,6 +450,8 @@
 /usr/local/opnsense/mvc/app/models/OPNsense/IDS/Migrations/M1_0_0.php
 /usr/local/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
+/usr/local/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/ACL/ACL.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/Menu/Menu.xml
 /usr/local/opnsense/mvc/app/models/OPNsense/Proxy/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 a14f19585..d1bb4c83c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -255,13 +255,6 @@
             <Lookup order="40" url="/diag_dns.php"/>
             <LogFile order="100" VisibleName="Log File" url="/diag_logs_resolver.php"/>
         </DNSTools>
-        <NTP VisibleName="Network Time" cssClass="fa fa-clock-o fa-fw">
-            <General order="10" url="/services_ntpd.php"/>
-            <GPS order="20" url="/services_ntpd_gps.php"/>
-            <PPS order="30" url="/services_ntpd_pps.php"/>
-            <Status order="40" url="/status_ntpd.php"/>
-            <Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
-        </NTP>
         <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/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
index a5a322f0e..3fd03834c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Core/ACL/ACL.xml
@@ -644,13 +644,6 @@
             <pattern>services_dyndns.php*</pattern>
         </patterns>
     </page-services-dynamicdnsclients>
-    <page-services-ntpd>
-        <name>WebCfg - Services: NTP</name>
-        <description>Allow access to the 'Services: NTP' page.</description>
-        <patterns>
-            <pattern>services_ntpd.php*</pattern>
-        </patterns>
-    </page-services-ntpd>
     <page-services-rfc2136clients>
         <name>WebCfg - Services: RFC 2136 clients page</name>
         <description>Allow access to the 'Services: RFC 2136 clients' page.</description>
@@ -763,27 +756,6 @@
             <pattern>diag_ipsec_spd.php*</pattern>
         </patterns>
     </page-status-ipsec-spd>
-    <page-services-ntp-gps>
-        <name>WebCfg - Status: NTP GPS page</name>
-        <description>Allow access to the 'Status: NTP Serial GPS' page.</description>
-        <patterns>
-            <pattern>status_ntpd_gps.php*</pattern>
-        </patterns>
-    </page-services-ntp-gps>
-    <page-status-ntp>
-        <name>WebCfg - Status: NTP page</name>
-        <description>Allow access to the 'Status: NTP' page.</description>
-        <patterns>
-            <pattern>status_ntpd.php*</pattern>
-        </patterns>
-    </page-status-ntp>
-    <page-services-ntp-pps>
-        <name>WebCfg - Status: NTP PPS page</name>
-        <description>Allow access to the 'Status: NTP PPS' page.</description>
-        <patterns>
-            <pattern>status_ntpd_pps.php*</pattern>
-        </patterns>
-    </page-services-ntp-pps>
     <page-status-openvpn>
         <name>WebCfg - Status: OpenVPN page</name>
         <description>Allow access to the 'Status: OpenVPN' page.</description>
@@ -819,13 +791,6 @@
             <pattern>diag_logs_ppp.php*</pattern>
         </patterns>
     </page-status-systemlogs-ppp>
-    <page-status-systemlogs-ntpd>
-        <name>WebCfg - Status: System logs: NTP page</name>
-        <description>Allow access to the 'Status: System logs: NTP' page.</description>
-        <patterns>
-            <pattern>diag_logs_ntpd.php*</pattern>
-        </patterns>
-    </page-status-systemlogs-ntpd>
     <page-status-systemlogs-openvpn>
         <name>WebCfg - Status: System logs: OpenVPN page</name>
         <description>Allow access to the 'Status: System logs: OpenVPN' page.</description>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
new file mode 100644
index 000000000..689add8d2
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Ntpd/ACL/ACL.xml
@@ -0,0 +1,37 @@
+<acl>
+    <page-services-ntpd>
+        <name>WebCfg - Services: NTP</name>
+        <description>Allow access to the 'Services: NTP' page.</description>
+        <patterns>
+            <pattern>services_ntpd.php*</pattern>
+        </patterns>
+    </page-services-ntpd>
+    <page-services-ntp-gps>
+        <name>WebCfg - Status: NTP GPS page</name>
+        <description>Allow access to the 'Status: NTP Serial GPS' page.</description>
+        <patterns>
+            <pattern>status_ntpd_gps.php*</pattern>
+        </patterns>
+    </page-services-ntp-gps>
+    <page-status-ntp>
+        <name>WebCfg - Status: NTP page</name>
+        <description>Allow access to the 'Status: NTP' page.</description>
+        <patterns>
+            <pattern>status_ntpd.php*</pattern>
+        </patterns>
+    </page-status-ntp>
+    <page-services-ntp-pps>
+        <name>WebCfg - Status: NTP PPS page</name>
+        <description>Allow access to the 'Status: NTP PPS' page.</description>
+        <patterns>
+            <pattern>status_ntpd_pps.php*</pattern>
+        </patterns>
+    </page-services-ntp-pps>
+    <page-status-systemlogs-ntpd>
+        <name>WebCfg - Status: System logs: NTP page</name>
+        <description>Allow access to the 'Status: System logs: NTP' page.</description>
+        <patterns>
+            <pattern>diag_logs_ntpd.php*</pattern>
+        </patterns>
+    </page-status-systemlogs-ntpd>
+</acl>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
new file mode 100644
index 000000000..f9f1df3e7
--- /dev/null
+++ b/src/opnsense/mvc/app/models/OPNsense/Ntpd/Menu/Menu.xml
@@ -0,0 +1,11 @@
+<menu>
+    <Services>
+        <NTP VisibleName="Network Time" cssClass="fa fa-clock-o fa-fw">
+            <General order="10" url="/services_ntpd.php"/>
+            <GPS order="20" url="/services_ntpd_gps.php"/>
+            <PPS order="30" url="/services_ntpd_pps.php"/>
+            <Status order="40" url="/status_ntpd.php"/>
+            <Log order="50" VisibleName="Log File" url="/diag_logs_ntpd.php"/>
+        </NTP>
+    </Services>
+</menu>