diff --git a/zabbix52-server/Makefile b/zabbix52-server/Makefile
index c1072441c2..067e11ac72 100644
--- a/zabbix52-server/Makefile
+++ b/zabbix52-server/Makefile
@@ -32,7 +32,13 @@ CONF_FILES+=	${EGDIR}/zabbix_server.conf ${PKG_SYSCONFDIR}/zabbix_server.conf
 RCD_SCRIPTS=	zabbix_server
 SMF_NAME=	zabbix-server
 
-INSTALLATION_DIRS+=	${EGDIR} share/${PKGBASE}
+MISCDIRS=	images snmptrap
+
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALLATION_DIRS+=	share/${PKGBASE}
+.for MISCDIR in ${MISCDIRS}
+INSTALLATION_DIRS+=	share/${PKGBASE}/misc/${MISCDIR}
+.endfor
 
 SUBST_CLASSES+=			fix-paths
 SUBST_STAGE.fix-paths=		pre-configure
@@ -51,6 +57,9 @@ PLIST_SUBST+=			PKGBASE=${PKGBASE}
 
 CFLAGS.SunOS+=			-DDUK_USE_BYTEORDER=1
 
+REPLACE_BASH+=                  misc/snmptrap/snmptrap.sh \
+                                misc/images/png_to_xml.sh
+
 .include "../../mk/bsd.prefs.mk"
 
 pre-configure:
@@ -60,6 +69,10 @@ pre-configure:
 post-install:
 	cd ${WRKSRC}/database/${ZABBIX_DB_TYPE}; \
 		${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/
+.for MISCDIR in ${MISCDIRS}
+	cd ${WRKSRC}/misc/${MISCDIR}; \
+		${PAX} -rw . ${DESTDIR}${PREFIX}/share/${PKGBASE}/misc/${MISCDIR}
+.endfor
 	${RM} ${DESTDIR}${PREFIX}/share/${PKGBASE}/Makefile*
 
 .include "options.mk"
diff --git a/zabbix52-server/PLIST b/zabbix52-server/PLIST
index d0b102492d..5ceb544d0d 100644
--- a/zabbix52-server/PLIST
+++ b/zabbix52-server/PLIST
@@ -8,6 +8,218 @@ share/${PKGBASE}/images.sql
 share/${PKGBASE}/schema.sql
 share/${PKGBASE}/double.sql
 ${PLIST.pgsql}share/${PKGBASE}/timescaledb.sql
+share/${PKGBASE}/misc/images/png_classic/Hub_small.png
+share/${PKGBASE}/misc/images/png_classic/Hub.png
+share/${PKGBASE}/misc/images/png_classic/Network_small.png
+share/${PKGBASE}/misc/images/png_classic/Network.png
+share/${PKGBASE}/misc/images/png_classic/Notebook_small.png
+share/${PKGBASE}/misc/images/png_classic/Notebook.png
+share/${PKGBASE}/misc/images/png_classic/Phone_small.png
+share/${PKGBASE}/misc/images/png_classic/Phone.png
+share/${PKGBASE}/misc/images/png_classic/Printer_small.png
+share/${PKGBASE}/misc/images/png_classic/Printer.png
+share/${PKGBASE}/misc/images/png_classic/README
+share/${PKGBASE}/misc/images/png_classic/Router_small.png
+share/${PKGBASE}/misc/images/png_classic/Router.png
+share/${PKGBASE}/misc/images/png_classic/Satellite_small.png
+share/${PKGBASE}/misc/images/png_classic/Satellite.png
+share/${PKGBASE}/misc/images/png_classic/Server_small.png
+share/${PKGBASE}/misc/images/png_classic/Server.png
+share/${PKGBASE}/misc/images/png_classic/UPS_small.png
+share/${PKGBASE}/misc/images/png_classic/UPS.png
+share/${PKGBASE}/misc/images/png_classic/Workstation_small.png
+share/${PKGBASE}/misc/images/png_classic/Workstation.png
+share/${PKGBASE}/misc/images/png_modern/Cloud_(128).png
+share/${PKGBASE}/misc/images/png_modern/Cloud_(24).png
+share/${PKGBASE}/misc/images/png_modern/Cloud_(48).png
+share/${PKGBASE}/misc/images/png_modern/Cloud_(64).png
+share/${PKGBASE}/misc/images/png_modern/Cloud_(96).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_(128).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_(24).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_(48).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_(64).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_(96).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_symbol_(128).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_symbol_(24).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_symbol_(48).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_symbol_(64).png
+share/${PKGBASE}/misc/images/png_modern/Crypto-router_symbol_(96).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_2D_(24).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_2D_(48).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_3D_(24).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_3D_(48).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Disk_array_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Firewall_(128).png
+share/${PKGBASE}/misc/images/png_modern/Firewall_(24).png
+share/${PKGBASE}/misc/images/png_modern/Firewall_(48).png
+share/${PKGBASE}/misc/images/png_modern/Firewall_(64).png
+share/${PKGBASE}/misc/images/png_modern/Firewall_(96).png
+share/${PKGBASE}/misc/images/png_modern/House_(128).png
+share/${PKGBASE}/misc/images/png_modern/House_(24).png
+share/${PKGBASE}/misc/images/png_modern/House_(48).png
+share/${PKGBASE}/misc/images/png_modern/House_(64).png
+share/${PKGBASE}/misc/images/png_modern/House_(96).png
+share/${PKGBASE}/misc/images/png_modern/Hub_(128).png
+share/${PKGBASE}/misc/images/png_modern/Hub_(24).png
+share/${PKGBASE}/misc/images/png_modern/Hub_(48).png
+share/${PKGBASE}/misc/images/png_modern/Hub_(64).png
+share/${PKGBASE}/misc/images/png_modern/Hub_(96).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_(128).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_(24).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_(48).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_(64).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_(96).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_symbol_(128).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_symbol_(24).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_symbol_(48).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_symbol_(64).png
+share/${PKGBASE}/misc/images/png_modern/IP_PBX_symbol_(96).png
+share/${PKGBASE}/misc/images/png_modern/Modem_(128).png
+share/${PKGBASE}/misc/images/png_modern/Modem_(24).png
+share/${PKGBASE}/misc/images/png_modern/Modem_(48).png
+share/${PKGBASE}/misc/images/png_modern/Modem_(64).png
+share/${PKGBASE}/misc/images/png_modern/Modem_(96).png
+share/${PKGBASE}/misc/images/png_modern/Network_(128).png
+share/${PKGBASE}/misc/images/png_modern/Network_(24).png
+share/${PKGBASE}/misc/images/png_modern/Network_(48).png
+share/${PKGBASE}/misc/images/png_modern/Network_(64).png
+share/${PKGBASE}/misc/images/png_modern/Network_(96).png
+share/${PKGBASE}/misc/images/png_modern/Network_adapter_(128).png
+share/${PKGBASE}/misc/images/png_modern/Network_adapter_(24).png
+share/${PKGBASE}/misc/images/png_modern/Network_adapter_(48).png
+share/${PKGBASE}/misc/images/png_modern/Network_adapter_(64).png
+share/${PKGBASE}/misc/images/png_modern/Network_adapter_(96).png
+share/${PKGBASE}/misc/images/png_modern/Notebook_(128).png
+share/${PKGBASE}/misc/images/png_modern/Notebook_(24).png
+share/${PKGBASE}/misc/images/png_modern/Notebook_(48).png
+share/${PKGBASE}/misc/images/png_modern/Notebook_(64).png
+share/${PKGBASE}/misc/images/png_modern/Notebook_(96).png
+share/${PKGBASE}/misc/images/png_modern/PBX_(128).png
+share/${PKGBASE}/misc/images/png_modern/PBX_(24).png
+share/${PKGBASE}/misc/images/png_modern/PBX_(48).png
+share/${PKGBASE}/misc/images/png_modern/PBX_(64).png
+share/${PKGBASE}/misc/images/png_modern/PBX_(96).png
+share/${PKGBASE}/misc/images/png_modern/Phone_(128).png
+share/${PKGBASE}/misc/images/png_modern/Phone_(24).png
+share/${PKGBASE}/misc/images/png_modern/Phone_(48).png
+share/${PKGBASE}/misc/images/png_modern/Phone_(64).png
+share/${PKGBASE}/misc/images/png_modern/Phone_(96).png
+share/${PKGBASE}/misc/images/png_modern/Printer_(128).png
+share/${PKGBASE}/misc/images/png_modern/Printer_(24).png
+share/${PKGBASE}/misc/images/png_modern/Printer_(48).png
+share/${PKGBASE}/misc/images/png_modern/Printer_(64).png
+share/${PKGBASE}/misc/images/png_modern/Printer_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_with_door_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_with_door_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rack_42_with_door_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_1U_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_2U_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_3U_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_4U_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Rackmountable_5U_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Router_(128).png
+share/${PKGBASE}/misc/images/png_modern/Router_(24).png
+share/${PKGBASE}/misc/images/png_modern/Router_(48).png
+share/${PKGBASE}/misc/images/png_modern/Router_(64).png
+share/${PKGBASE}/misc/images/png_modern/Router_(96).png
+share/${PKGBASE}/misc/images/png_modern/Router_symbol_(128).png
+share/${PKGBASE}/misc/images/png_modern/Router_symbol_(24).png
+share/${PKGBASE}/misc/images/png_modern/Router_symbol_(48).png
+share/${PKGBASE}/misc/images/png_modern/Router_symbol_(64).png
+share/${PKGBASE}/misc/images/png_modern/Router_symbol_(96).png
+share/${PKGBASE}/misc/images/png_modern/SAN_(128).png
+share/${PKGBASE}/misc/images/png_modern/SAN_(24).png
+share/${PKGBASE}/misc/images/png_modern/SAN_(48).png
+share/${PKGBASE}/misc/images/png_modern/SAN_(64).png
+share/${PKGBASE}/misc/images/png_modern/SAN_(96).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_(128).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_(24).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_(48).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_(64).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_(96).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_antenna_(128).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_antenna_(24).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_antenna_(48).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_antenna_(64).png
+share/${PKGBASE}/misc/images/png_modern/Satellite_antenna_(96).png
+share/${PKGBASE}/misc/images/png_modern/Server_(128).png
+share/${PKGBASE}/misc/images/png_modern/Server_(24).png
+share/${PKGBASE}/misc/images/png_modern/Server_(48).png
+share/${PKGBASE}/misc/images/png_modern/Server_(64).png
+share/${PKGBASE}/misc/images/png_modern/Server_(96).png
+share/${PKGBASE}/misc/images/png_modern/Switch_(128).png
+share/${PKGBASE}/misc/images/png_modern/Switch_(24).png
+share/${PKGBASE}/misc/images/png_modern/Switch_(48).png
+share/${PKGBASE}/misc/images/png_modern/Switch_(64).png
+share/${PKGBASE}/misc/images/png_modern/Switch_(96).png
+share/${PKGBASE}/misc/images/png_modern/UPS_(128).png
+share/${PKGBASE}/misc/images/png_modern/UPS_(24).png
+share/${PKGBASE}/misc/images/png_modern/UPS_(48).png
+share/${PKGBASE}/misc/images/png_modern/UPS_(64).png
+share/${PKGBASE}/misc/images/png_modern/UPS_(96).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_2D_(24).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_2D_(48).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_3D_(24).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_3D_(48).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/UPS_rackmountable_3D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Video_terminal_(128).png
+share/${PKGBASE}/misc/images/png_modern/Video_terminal_(24).png
+share/${PKGBASE}/misc/images/png_modern/Video_terminal_(48).png
+share/${PKGBASE}/misc/images/png_modern/Video_terminal_(64).png
+share/${PKGBASE}/misc/images/png_modern/Video_terminal_(96).png
+share/${PKGBASE}/misc/images/png_modern/Workstation_(128).png
+share/${PKGBASE}/misc/images/png_modern/Workstation_(24).png
+share/${PKGBASE}/misc/images/png_modern/Workstation_(48).png
+share/${PKGBASE}/misc/images/png_modern/Workstation_(64).png
+share/${PKGBASE}/misc/images/png_modern/Workstation_(96).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_2D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_2D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_2D_(96).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_3D_(128).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_3D_(64).png
+share/${PKGBASE}/misc/images/png_modern/Zabbix_server_3D_(96).png
+share/${PKGBASE}/misc/images/png_to_xml.sh
+share/${PKGBASE}/misc/images/README
+share/${PKGBASE}/misc/snmptrap/snmptrap.sh
+share/${PKGBASE}/misc/snmptrap/zabbix_trap_receiver.pl
 @pkgdir share/${PKGBASE}/externalscripts
 @pkgdir share/${PKGBASE}/alertscripts
 @pkgdir lib/modules