diff --git a/net-mgmt/xymon-client/LICENSE b/net-mgmt/xymon-client/LICENSE
new file mode 100644
index 0000000000..05e44609c7
--- /dev/null
+++ b/net-mgmt/xymon-client/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Kumy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/net-mgmt/xymon-client/Makefile b/net-mgmt/xymon-client/Makefile
new file mode 100644
index 0000000000..10576a5e6c
--- /dev/null
+++ b/net-mgmt/xymon-client/Makefile
@@ -0,0 +1,8 @@
+PLUGIN_NAME=        xymon-client
+PLUGIN_VERSION=     1.0.0
+PLUGIN_REVISION=    1
+PLUGIN_DEPENDS=     xymon-client
+PLUGIN_COMMENT=     Client for the Xymon network monitor
+PLUGIN_MAINTAINER=  github+opnsense-xymon-client@kumy.net
+
+.include "../../Mk/plugins.mk"
diff --git a/net-mgmt/xymon-client/pkg-descr b/net-mgmt/xymon-client/pkg-descr
new file mode 100644
index 0000000000..b903f655e1
--- /dev/null
+++ b/net-mgmt/xymon-client/pkg-descr
@@ -0,0 +1,13 @@
+Client data collection package for Xymon (previously known as Hobbit).
+
+This gathers statistics and data from a single system and reports it to
+the Xymon monitor.
+
+WWW: https://sourceforge.net/projects/xymon/
+
+Plugin Changelog
+================
+
+1.0.0
+
+* Initial release
diff --git a/net-mgmt/xymon-client/src/etc/inc/plugins.inc.d/xymonclient.inc b/net-mgmt/xymon-client/src/etc/inc/plugins.inc.d/xymonclient.inc
new file mode 100644
index 0000000000..d095d3b54e
--- /dev/null
+++ b/net-mgmt/xymon-client/src/etc/inc/plugins.inc.d/xymonclient.inc
@@ -0,0 +1,69 @@
+<?php
+
+/*
+    Copyright (c) 2024 Kumy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+function xymonclient_enabled()
+{
+    return (string)(new Kumy\XymonClient\Settings())->enabled == '1';
+}
+
+function xymonclient_services()
+{
+    global $config;
+
+    $services = [];
+
+    $fqdn = sprintf('%s.%s',
+        $config['system']['hostname'],
+        $config['system']['domain'],
+    );
+
+    if (xymonclient_enabled()) {
+        $services[] = [
+            'description' => gettext('Xymon client'),
+            'configd' => [
+                'restart' => ['xymonclient restart'],
+                'start' => ['xymonclient start'],
+                'stop' => ['xymonclient stop'],
+            ],
+            'name' => 'xymonclient',
+            'pidfile' => "/var/run/xymon/xymon_client.pid"
+        ];
+    }
+
+    return $services;
+}
+
+function xymonclient_xmlrpc_sync()
+{
+    $result = [];
+
+    $result[] = [
+        'description' => gettext('Xymon client'),
+        'section' => 'kumy.xymon.client',
+        'id' => 'xymonclient',
+        'services' => ['xymonclient'],
+    ];
+
+    return $result;
+}
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/ServiceController.php b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/ServiceController.php
new file mode 100644
index 0000000000..1586d290c9
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/ServiceController.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+    Copyright (c) 2024 Kumy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+namespace Kumy\XymonClient\Api;
+
+use OPNsense\Base\ApiMutableServiceControllerBase;
+
+class ServiceController extends ApiMutableServiceControllerBase
+{
+    protected static $internalServiceClass = '\Kumy\XymonClient\Settings';
+    protected static $internalServiceTemplate = 'Kumy\XymonClient';
+    protected static $internalServiceEnabled = 'enabled';
+    protected static $internalServiceName = 'xymonclient';
+}
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/SettingsController.php b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/SettingsController.php
new file mode 100644
index 0000000000..910460fcf3
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/Api/SettingsController.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+    Copyright (c) 2024 Kumy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+namespace Kumy\XymonClient\Api;
+
+use OPNsense\Base\ApiMutableModelControllerBase;
+use OPNsense\Core\Backend;
+
+class SettingsController extends ApiMutableModelControllerBase
+{
+    protected static $internalModelClass = '\Kumy\XymonClient\Settings';
+    protected static $internalModelName = 'xymonclient';
+
+    public function reconfigureAction()
+    {
+        $status = 'failed';
+        if ($this->request->isPost()) {
+            $backend = new Backend();
+            $status = strtolower(trim($backend->configdRun('template reload Kumy/XymonClient')));
+            if ($status === 'ok') {
+                $config = $this->getModel();
+                if ((string)$config->enabled == "1" && !empty((string)$config->XYMSERVERS)) {
+                    $status = $backend->configdRun('xymonclient restart');
+                } else {
+                    $status = $backend->configdRun('xymonclient stop');
+                }
+            }
+        }
+        return ['status' => strtolower(trim($status))];
+    }
+}
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/IndexController.php b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/IndexController.php
new file mode 100644
index 0000000000..5c5274ab56
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/IndexController.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+    Copyright (c) 2024 Kumy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+namespace Kumy\XymonClient;
+
+class IndexController extends \OPNsense\Base\IndexController
+{
+    public function indexAction()
+    {
+        $this->view->formSettings = $this->getForm('settings');
+        $this->view->pick('Kumy/XymonClient/index');
+    }
+}
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/forms/settings.xml b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/forms/settings.xml
new file mode 100644
index 0000000000..f7f0b96410
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/controllers/Kumy/XymonClient/forms/settings.xml
@@ -0,0 +1,16 @@
+<form>
+    <field>
+        <id>xymonclient.enabled</id>
+        <label>Enabled</label>
+        <type>checkbox</type>
+    </field>
+    <field>
+        <id>xymonclient.XYMSERVERS</id>
+        <label>Server addresses</label>
+        <type>select_multiple</type>
+        <allownew>true</allownew>
+        <separator> </separator>
+        <style>tokenize</style>
+        <help>Xymon server addresses.</help>
+    </field>
+ </form>
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Menu/Menu.xml b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Menu/Menu.xml
new file mode 100644
index 0000000000..0fffdf082b
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Menu/Menu.xml
@@ -0,0 +1,5 @@
+<menu>
+    <Services>
+        <XymonClient VisibleName="Xymon Client" cssClass="fa fa-heartbeat fa-fw" url="/ui/xymonclient"></XymonClient>
+    </Services>
+</menu>
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.php b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.php
new file mode 100644
index 0000000000..f3fb72613c
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+    Copyright (c) 2024 Kumy
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+*/
+
+namespace Kumy\XymonClient;
+
+use OPNsense\Base\BaseModel;
+
+class Settings extends BaseModel {
+}
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.xml b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.xml
new file mode 100644
index 0000000000..76f76ed418
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/models/Kumy/XymonClient/Settings.xml
@@ -0,0 +1,20 @@
+<model>
+    <mount>//kumy/xymon/client</mount>
+    <description>Xymon client settings</description>
+    <version>0.0.0</version>
+    <items>
+        <enabled type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </enabled>
+        <XYMSERVERS type="HostnameField">
+            <Required>N</Required>
+            <IpAllowed>Y</IpAllowed>
+            <HostWildcardAllowed>N</HostWildcardAllowed>
+            <FqdnWildcardAllowed>N</FqdnWildcardAllowed>
+            <ZoneRootAllowed>N</ZoneRootAllowed>
+            <AsList>Y</AsList>
+            <FieldSeparator> </FieldSeparator>
+        </XYMSERVERS>
+    </items>
+</model>
diff --git a/net-mgmt/xymon-client/src/opnsense/mvc/app/views/Kumy/XymonClient/index.volt b/net-mgmt/xymon-client/src/opnsense/mvc/app/views/Kumy/XymonClient/index.volt
new file mode 100644
index 0000000000..6a547b9007
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/mvc/app/views/Kumy/XymonClient/index.volt
@@ -0,0 +1,41 @@
+<script type="text/javascript">
+    $(function() {
+        mapDataToFormUI({"frm_Settings": "/api/xymonclient/settings/get"}).done(function(data) {
+            if ('frm_Settings' in data) {
+                updateServiceControlUI('xymonclient');
+                formatTokenizersUI();
+            }
+        });
+
+        $("#reconfigureAct").SimpleActionButton({
+            onPreAction: function() {
+                const dfObj = new $.Deferred();
+                saveFormToEndpoint("/api/xymonclient/settings/set", "frm_Settings", function() {
+                    dfObj.resolve();
+                });
+                return dfObj;
+            }
+        });
+    });
+</script>
+
+<section class="page-content-main">
+    <div class="content-box">
+        {{ partial("layout_partials/base_form", ["fields": formSettings, "id": "frm_Settings"]) }}
+    </div>
+    <br><br>
+
+    <div class="content-box">
+        <div class="col-md-12">
+            <br/>
+            <button class="btn btn-primary" id="reconfigureAct"
+                    data-endpoint='/api/xymonclient/settings/reconfigure'
+                    data-label="{{ lang._('Apply') }}"
+                    data-service-widget="xymonclient"
+                    data-error-title="{{ lang._('Error reconfiguring Xymon Client') }}"
+                    type="button"
+            ></button>
+            <br/><br/>
+        </div>
+    </div>
+</section>
diff --git a/net-mgmt/xymon-client/src/opnsense/service/conf/actions.d/actions_xymonclient.conf b/net-mgmt/xymon-client/src/opnsense/service/conf/actions.d/actions_xymonclient.conf
new file mode 100644
index 0000000000..8dfc6ffdc4
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/service/conf/actions.d/actions_xymonclient.conf
@@ -0,0 +1,25 @@
+[start]
+command: service xymon-client start
+parameters:
+type:script
+message:xymon-client service start
+
+[stop]
+command: service xymon-client stop
+parameters:
+type:script
+message:xymon-client service stop
+
+[restart]
+command: service xymon-client restart
+parameters:
+type:script
+message:xymon-client service restart
+
+[status]
+# Note: The rc script is exiting with errcode 1
+# if the service is not running
+command: service xymon-client status; exit 0
+parameters:
+type:script_output
+message:xymon-client service status
diff --git a/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/+TARGETS b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/+TARGETS
new file mode 100644
index 0000000000..87c9cdf8cb
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/+TARGETS
@@ -0,0 +1,2 @@
+xymonclient.cfg:/usr/local/etc/xymon/xymonclient.cfg
+xymon_client:/etc/rc.conf.d/xymon_client
diff --git a/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymon_client b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymon_client
new file mode 100644
index 0000000000..2d28a76322
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymon_client
@@ -0,0 +1 @@
+xymon_client_enable={% if not helpers.empty('kumy.xymon.client.enabled') and not helpers.empty('kumy.xymon.client.XYMSERVERS') %}YES{% else %}NO{% endif %}
diff --git a/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymonclient.cfg b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymonclient.cfg
new file mode 100644
index 0000000000..7366e5aaaf
--- /dev/null
+++ b/net-mgmt/xymon-client/src/opnsense/service/templates/Kumy/XymonClient/xymonclient.cfg
@@ -0,0 +1,4 @@
+# Automatically managed config do not edit manually
+
+XYMSRV="0.0.0.0"
+XYMSERVERS="{% if not helpers.empty('kumy.xymon.client.XYMSERVERS') %}{{ kumy.xymon.client.XYMSERVERS }}{% endif %}"