diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index 40f39eee6..b1160326c 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		zabbix-agent
-PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		Zabbix monitoring agent
 PLUGIN_DEPENDS=		zabbix5-agent
 PLUGIN_MAINTAINER=	opnsense@moov.de
diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr
index e080b7c51..8e22f3335 100644
--- a/net-mgmt/zabbix-agent/pkg-descr
+++ b/net-mgmt/zabbix-agent/pkg-descr
@@ -12,8 +12,59 @@ WWW: https://www.zabbix.com/
 Plugin Changelog
 ----------------
 
+1.9
+
+Added:
+* Allow CIDR notation in "Zabbix Servers" field (#2296)
+* Add syslog option, allow logging to syslog (#2348)
+
+Changed:
+* Use "NetworkField" wherever applicable for better input validation
+
 1.8
 
-* Add Changelog (contributed by Starkstromkonsument)
-* Fix logformat (contributed by Starkstromkonsument)
+Added:
+* Add Changelog (contributed by Starkstromkonsument, #1954)
+
+Fixed:
+* Fix logformat (contributed by Starkstromkonsument, #1954)
+
+Changed:
 * Switch to Zabbix Agent 5.0
+
+1.7
+
+Added:
+* Add support for PSK encryption (#1618)
+
+Changed:
+* Switch to new log view (#1593)
+
+1.6
+
+Added:
+* Add option to grant sudo root access
+
+1.5
+
+Fixed:
+* Relax validation mask for User Parameters (#1252)
+
+Changed:
+* Migrate to ApiMutableServiceController
+
+1.4
+
+Added:
+* Add support for Item Key Aliases
+* Add support for User Parameters
+
+Changed:
+* Switch to Zabbix Agent 4.0 (#1091)
+* Remove default comments from template
+
+1.3
+
+Fixed:
+* Add working default values (#491)
+* Fixed service controls (#551)
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
index 0ec47135a..9735389b8 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
@@ -31,7 +31,8 @@
             <id>zabbixagent.settings.main.sourceIP</id>
             <label>Source IP</label>
             <type>text</type>
-            <help><![CDATA[Source IP address for outgoing connections.]]></help>
+            <hint>Optional</hint>
+            <help><![CDATA[An optional source IP address for outgoing connections.]]></help>
         </field>
         <field>
             <id>zabbixagent.settings.main.serverList</id>
@@ -119,7 +120,7 @@
             <type>select_multiple</type>
             <style>tokenize</style>
             <allownew>true</allownew>
-            <help><![CDATA[List of IP:port (or hostname:port) pairs of Zabbix servers for active checks. If port is not specified, default port is used. IPv6 addresses must be enclosed in square brackets if port for that host is specified. If port is not specified, square brackets for IPv6 addresses are optional. If this parameter is not specified, active checks are disabled. Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]]]></help>
+            <help><![CDATA[List of IP:port (or hostname:port) pairs of Zabbix servers for active checks. If port is not specified, the default port is used. IPv6 addresses must be enclosed in square brackets if the port for that host is specified. If the port is not specified, square brackets for IPv6 addresses are optional. If this parameter is not specified, active checks are disabled. Examples: zabbix.example.com, 10.0.0.2:20051, [::1]:30051,::1, [12fc::1]]]></help>
         </field>
         <field>
             <id>zabbixagent.settings.features.refreshActiveChecks</id>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
index 4786605fd..6e09e77d4 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
@@ -1,6 +1,6 @@
 <model>
     <mount>//OPNsense/ZabbixAgent</mount>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <description>Zabbix monitoring agent</description>
     <items>
         <!-- local settings that should NOT be synced to another node -->
@@ -22,9 +22,9 @@
                     <default>127.0.0.1</default>
                     <Required>Y</Required>
                     <multiple>Y</multiple>
-                    <mask>/^([a-zA-Z0-9\.:\[\]\-]*?,)*([a-zA-Z0-9\.:\[\]\-]*)$/</mask>
+                    <mask>/^([a-zA-Z0-9\.:\[\]\-\/]*?,)*([a-zA-Z0-9\.:\[\]\-\/]*)$/</mask>
                     <ChangeCase>lower</ChangeCase>
-                    <ValidationMessage>Please provide valid Zabbix server addresses, i.e. 10.0.0.1 or zabbix.example.com.</ValidationMessage>
+                    <ValidationMessage>Please provide valid Zabbix server addresses, i.e. zabbix.example.com, 10.0.0.2 or 10.0.0.0/24.</ValidationMessage>
                 </serverList>
                 <listenPort type="IntegerField">
                     <default>10050</default>
@@ -32,18 +32,19 @@
                     <MaximumValue>65535</MaximumValue>
                     <Required>Y</Required>
                 </listenPort>
-                <listenIP type="CSVListField">
+                <listenIP type="NetworkField">
                     <default>0.0.0.0</default>
                     <Required>Y</Required>
                     <multiple>Y</multiple>
-                    <mask>/^((([0-9a-zA-Z._\-\*:]+)([,]){0,1}))*/u</mask>
-                    <ChangeCase>lower</ChangeCase>
-                    <ValidationMessage>Please provide valid IP addresses, i.e. 10.0.0.1.</ValidationMessage>
+                    <NetMaskAllowed>N</NetMaskAllowed>
+                    <asList>Y</asList>
+                    <FieldSeparator>,</FieldSeparator>
+                    <ValidationMessage>Please provide one or more valid IP addresses, i.e. 10.0.0.1.</ValidationMessage>
                 </listenIP>
-                <sourceIP type="TextField">
+                <sourceIP type="NetworkField">
                     <Required>N</Required>
-                    <mask>/^.{1,255}$/u</mask>
-                    <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
+                    <NetMaskAllowed>N</NetMaskAllowed>
+                    <ValidationMessage>Please provide a valid IP address, i.e. 10.0.0.1.</ValidationMessage>
                 </sourceIP>
                 <syslogEnable type="BooleanField">
                     <default>0</default>