diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile
index 4c875d2f5a..b53ea9df9d 100644
--- a/admin/zabbix/Makefile
+++ b/admin/zabbix/Makefile
@@ -446,7 +446,7 @@ ifdef CONFIG_PACKAGE_zabbix-extra-mac80211
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	mkdir -p $(PKG_BUILD_DIR)/zabbix-extra-mac80211
-	$(CP) ./files/zabbix_helper_mac80211.c $(PKG_BUILD_DIR)/zabbix-extra-mac80211/
+	$(CP) ./src-extra/zabbix_helper_mac80211.c $(PKG_BUILD_DIR)/zabbix-extra-mac80211/
 endef
 
 define Build/Configure
@@ -486,8 +486,8 @@ define Package/zabbix/install/init.d
 endef
 
 define Package/zabbix/install/zabbix.conf.d
-	$(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
-	$(INSTALL_BIN) ./files/$(2) $(1)/etc/zabbix_agentd.conf.d/$(2)
+	$(INSTALL_DIR) $(1)/usr/share/zabbix_agentd.openwrt-params.d
+	$(INSTALL_DATA) ./files/usr/share/zabbix_agentd.openwrt-params.d/$(2) $(1)/usr/share/zabbix_agentd.openwrt-params.d/$(2)
 endef
 
 define Package/zabbix-agentd/conffiles
@@ -497,6 +497,7 @@ endef
 
 define Package/zabbix-agentd/install
 	$(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
+	$(INSTALL_DIR) $(1)/usr/share/zabbix_agentd.openwrt-params.d
 	$(call Package/zabbix/install/sbin,$(1),agentd)
 	$(call Package/zabbix/install/etc,$(1),agentd)
 	$(call Package/zabbix/install/init.d,$(1),agentd)
@@ -509,6 +510,7 @@ endef
 
 define Package/zabbix-agentd-basic/install
 	$(INSTALL_DIR) $(1)/etc/zabbix_agentd.conf.d
+	$(INSTALL_DIR) $(1)/usr/share/zabbix_agentd.openwrt-params.d
 	$(call Package/zabbix/install/sbin,$(1),agentd)
 	$(call Package/zabbix/install/etc,$(1),agentd)
 	$(call Package/zabbix/install/init.d,$(1),agentd)
@@ -580,7 +582,7 @@ endef
 define Package/zabbix-extra-network/install
 	$(call Package/zabbix/install/zabbix.conf.d,$(1),network)
 	$(INSTALL_DIR) $(1)/usr/share/acl.d
-	$(INSTALL_DATA) ./files/zabbix-network-ubus-acl.json $(1)/usr/share/acl.d/zabbix-network.json
+	$(INSTALL_DATA) ./files/usr/share/acl.d/zabbix-network-ubus-acl.json $(1)/usr/share/acl.d/zabbix-network.json
 endef
 
 define Package/zabbix-extra-network/postinst
@@ -593,7 +595,7 @@ endef
 define Package/zabbix-extra-wifi/install
 	$(call Package/zabbix/install/zabbix.conf.d,$(1),wifi)
 	$(INSTALL_DIR) $(1)/usr/share/acl.d
-	$(INSTALL_DATA) ./files/zabbix-wifi-ubus-acl.json $(1)/usr/share/acl.d/zabbix-wifi.json
+	$(INSTALL_DATA) ./files/usr/share/acl.d/zabbix-wifi-ubus-acl.json $(1)/usr/share/acl.d/zabbix-wifi.json
 endef
 
 define Package/zabbix-extra-wifi/postinst
diff --git a/admin/zabbix/files/zabbix-network-ubus-acl.json b/admin/zabbix/files/usr/share/acl.d/zabbix-network-ubus-acl.json
similarity index 100%
rename from admin/zabbix/files/zabbix-network-ubus-acl.json
rename to admin/zabbix/files/usr/share/acl.d/zabbix-network-ubus-acl.json
diff --git a/admin/zabbix/files/zabbix-wifi-ubus-acl.json b/admin/zabbix/files/usr/share/acl.d/zabbix-wifi-ubus-acl.json
similarity index 100%
rename from admin/zabbix/files/zabbix-wifi-ubus-acl.json
rename to admin/zabbix/files/usr/share/acl.d/zabbix-wifi-ubus-acl.json
diff --git a/admin/zabbix/files/mac80211 b/admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/mac80211
similarity index 100%
rename from admin/zabbix/files/mac80211
rename to admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/mac80211
diff --git a/admin/zabbix/files/network b/admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/network
similarity index 100%
rename from admin/zabbix/files/network
rename to admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/network
diff --git a/admin/zabbix/files/wifi b/admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/wifi
similarity index 100%
rename from admin/zabbix/files/wifi
rename to admin/zabbix/files/usr/share/zabbix_agentd.openwrt-params.d/wifi
diff --git a/admin/zabbix/patches/010-change-agentd-config.patch b/admin/zabbix/patches/010-change-agentd-config.patch
index 7450e81e62..b94fbe693f 100644
--- a/admin/zabbix/patches/010-change-agentd-config.patch
+++ b/admin/zabbix/patches/010-change-agentd-config.patch
@@ -83,10 +83,11 @@ Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>
  
  ####### USER-DEFINED MONITORED PARAMETERS #######
  
-@@ -547,5 +541,5 @@ Hostname=Zabbix server
+@@ -547,5 +541,6 @@ Hostname=Zabbix server
  # Include=
  
  # Include=/usr/local/etc/zabbix_agentd.userparams.conf
 -# Include=/usr/local/etc/zabbix_agentd.conf.d/
  # Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
++Include=/usr/share/zabbix_agentd.openwrt-params.d/
 +Include=/etc/zabbix_agentd.conf.d/
diff --git a/admin/zabbix/files/zabbix_helper_mac80211.c b/admin/zabbix/src-extra/zabbix_helper_mac80211.c
similarity index 100%
rename from admin/zabbix/files/zabbix_helper_mac80211.c
rename to admin/zabbix/src-extra/zabbix_helper_mac80211.c