diff --git a/.gitignore b/.gitignore
index cf89f870..8abdc284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,8 @@
 # html files (as generated from markdown)
 *.html
 
+# checksums file as used by $ScriptInstallUpdate
+checksums.json
+
 # Mac OS X folder settings file
 .DS_Store
diff --git a/Makefile b/Makefile
index d21713c2..89517410 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ WIFI = $(wildcard *.wifi.rsc)
 MARKDOWN = $(wildcard *.md doc/*.md doc/mod/*.md)
 HTML = $(MARKDOWN:.md=.html)
 
-all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML)
+all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json
 
 %.html: %.md Makefile
 	markdown $< | sed 's/href="\([-_\./[:alnum:]]*\)\.md"/href="\1.html"/g' > $@
@@ -32,5 +32,8 @@ all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML)
 		-e '/^# !!/,/^# !!/c # !! Do not edit this file, it is generated from template!' \
 		< $< > $@
 
+checksums.json: contrib/checksums.sh *.rsc */*.rsc
+	contrib/checksums.sh
+
 clean:
-	rm -f $(HTML)
+	rm -f $(HTML) checksums.json
diff --git a/README.md b/README.md
index fae69869..6a653504 100644
--- a/README.md
+++ b/README.md
@@ -225,6 +225,7 @@ Available scripts
 * [Renew certificates and notify on expiration](doc/check-certificates.md)
 * [Notify about health state](doc/check-health.md)
 * [Notify on LTE firmware upgrade](doc/check-lte-firmware-upgrade.md)
+* [Check perpetual license on CHR](doc/check-perpetual-license.md)
 * [Notify on RouterOS update](doc/check-routeros-update.md)
 * [Collect MAC addresses in wireless access list](doc/collect-wireless-mac.md)
 * [Use wireless network with daily psk](doc/daily-psk.md)
@@ -263,6 +264,7 @@ Available modules
 * [Inspect variables](doc/mod/inspectvar.md)
 * [IP address calculation](doc/mod/ipcalc.md)
 * [Send notifications via e-mail](doc/mod/notification-email.md)
+* [Send notifications via Gotify](doc/mod/notification-gotify.md)
 * [Send notifications via Matrix](doc/mod/notification-matrix.md)
 * [Send notifications via Ntfy](doc/mod/notification-ntfy.md)
 * [Send notifications via Telegram](doc/mod/notification-telegram.md)
diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc
new file mode 100644
index 00000000..9a3a3c74
--- /dev/null
+++ b/check-perpetual-license.rsc
@@ -0,0 +1,78 @@
+#!rsc by RouterOS
+# RouterOS script: check-perpetual-license
+# Copyright (c) 2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
+#
+# requires RouterOS, version=7.15
+#
+# check perpetual license on CHR
+# https://rsc.eworm.de/doc/check-perpetual-license.md
+
+:global GlobalFunctionsReady;
+:while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
+
+:local ExitOK false;
+:do {
+  :local ScriptName [ :jobname ];
+
+  :global Identity;
+  :global SentCertificateNotification;
+
+  :global LogPrint;
+  :global ScriptLock;
+  :global SendNotification2;
+  :global SymbolForNotification;
+  :global WaitFullyConnected;
+
+  :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
+    :error false;
+  }
+
+  $WaitFullyConnected;
+
+  :local License [ /system/license/get ];
+  :if ([ :typeof ($License->"deadline-at") ] != "str") do={
+    $LogPrint info $ScriptName ("This device does not have a perpetual license.");
+    :set ExitOK true;
+    :error true;
+  }
+  
+  :if ([ :len ($License->"next-renewal-at") ] = 0 && ($License->"limited-upgrades") = true) do={
+    $LogPrint warning $ScriptName ("Your license expired on " . ($License->"deadline-at") . "!");
+    :if ($SentCertificateNotification != "expired") do={
+      $SendNotification2 ({ origin=$ScriptName; \
+        subject=([ $SymbolForNotification "warning-sign" ] . "License expired!"); \
+        message=("Your license expired on " . ($License->"deadline-at") . \
+          ", can no longer update RouterOS on " . $Identity . "...") });
+      :set SentCertificateNotification "expired";
+    }
+    :set ExitOK true;
+    :error true;
+  }
+
+  :if ([ :totime ($License->"deadline-at") ] - 3w < [ :timestamp ]) do={
+    $LogPrint warning $ScriptName ("Your license will expire on " . ($License->"deadline-at") . "!");
+    :if ($SentCertificateNotification != "warning") do={
+      $SendNotification2 ({ origin=$ScriptName; \
+        subject=([ $SymbolForNotification "warning-sign" ] . "License about to expire!"); \
+        message=("Your license failed to renew and is about to expire on " . \
+          ($License->"deadline-at") . " on " . $Identity . "...") });
+      :set SentCertificateNotification "warning";
+    }
+    :set ExitOK true;
+    :error true;
+  }
+
+  :if ([ :typeof $SentCertificateNotification ] = "str" && \
+       [ :totime ($License->"deadline-at") ] - 4w > [ :timestamp ]) do={
+    $LogPrint info $ScriptName ("Your license was successfully renewed.");
+    $SendNotification2 ({ origin=$ScriptName; \
+      subject=([ $SymbolForNotification "white-heavy-check-mark" ] . "License renewed"); \
+      message=("Your license was successfully renewed on " . $Identity . \
+        ". It is now valid until " . ($License->"deadline-at") . ".") });
+    :set SentCertificateNotification;
+  }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}
diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc
index 78161e4b..361be34e 100644
--- a/check-routeros-update.rsc
+++ b/check-routeros-update.rsc
@@ -66,27 +66,6 @@
     :error "A reboot for update is already scheduled.";
   }
 
-  :local License [ /system/license/get ];
-  :if ([ :typeof ($License->"deadline-at") ] = "str") do={
-    :if ([ :len ($License->"next-renewal-at") ] = 0 && ($License->"limited-upgrades") = true) do={
-      $LogPrint warning $ScriptName ("Your license expired on " . ($License->"deadline-at") . "!");
-      $SendNotification2 ({ origin=$ScriptName; \
-        subject=([ $SymbolForNotification "warning-sign" ] . "License expired!"); \
-        message=("Your license expired on " . ($License->"deadline-at") . \
-          ", can no longer update RouterOS on " . $Identity . "...") });
-      :set ExitOK true;
-      :error false;
-    }
-
-    :if ([ :totime ($License->"deadline-at") ] - 3w < [ :timestamp ]) do={
-      $LogPrint warning $ScriptName ("Your license will expire on " . ($License->"deadline-at") . "!");
-      $SendNotification2 ({ origin=$ScriptName; \
-        subject=([ $SymbolForNotification "warning-sign" ] . "License about to expire!"); \
-        message=("Your license failed to renew and is about to expire on " . \
-          ($License->"deadline-at") . " on " . $Identity . "...") });
-    }
-  }
-
   $LogPrint debug $ScriptName ("Checking for updates...");
   /system/package/update/check-for-updates without-paging as-value;
   :local Update [ /system/package/update/get ];
diff --git a/contrib/checksums.sh b/contrib/checksums.sh
new file mode 100755
index 00000000..b472b49f
--- /dev/null
+++ b/contrib/checksums.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# generate a checksums file as used by $ScriptInstallUpdate
+
+set -e
+
+md5sum $(find -name '*.rsc' | sort) | \
+	sed -e "s| \./||" -e 's|.rsc$||' | \
+	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add' > 'checksums.json'
diff --git a/doc/check-perpetual-license.d/notification.avif b/doc/check-perpetual-license.d/notification.avif
new file mode 100644
index 00000000..70ca603d
Binary files /dev/null and b/doc/check-perpetual-license.d/notification.avif differ
diff --git a/doc/check-perpetual-license.md b/doc/check-perpetual-license.md
new file mode 100644
index 00000000..d4440045
--- /dev/null
+++ b/doc/check-perpetual-license.md
@@ -0,0 +1,70 @@
+Check perpetual license on CHR
+==============================
+
+[![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
+[![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.15-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
+[![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
+
+[⬅️ Go back to main README](../README.md)
+
+> ℹ️ **Info**: This script can not be used on its own but requires the base
+> installation. See [main README](../README.md) for details.
+
+Description
+-----------
+
+On *Cloud Hosted Router* (*CHR*) the licensing is perpetual: Buy once, use
+forever - but it needs regular renewal. This script checks licensing state
+and sends a notification to warn before expiration.
+
+### Sample notification
+
+![check-perpetual-license notification](check-perpetual-license.d/notification.avif)
+
+Requirements and installation
+-----------------------------
+
+Just install the script:
+
+    $ScriptInstallUpdate check-perpetual-license;
+
+And add a scheduler for automatic update notification:
+
+    /system/scheduler/add interval=1d name=check-perpetual-license on-event="/system/script/run check-perpetual-license;" start-time=startup;
+
+Configuration
+-------------
+
+No extra configuration is required for this script, but notification
+settings are required for
+[e-mail](mod/notification-email.md),
+[matrix](mod/notification-matrix.md),
+[ntfy](mod/notification-ntfy.md) and/or
+[telegram](mod/notification-telegram.md).
+
+Usage and invocation
+--------------------
+
+Be notified when run from scheduler or run it manually:
+
+    /system/script/run check-perpetual-license;
+
+Tips & Tricks
+-------------
+
+The script checks for full connectivity before acting, so scheduling at
+startup is perfectly valid:
+
+    /system/scheduler/add name=check-perpetual-license@startup on-event="/system/script/run check-perpetual-license;" start-time=startup;
+
+See also
+--------
+
+* [Notify on RouterOS update](check-routeros-update.md)
+
+---
+[⬅️ Go back to main README](../README.md)  
+[⬆️ Go back to top](#top)
diff --git a/doc/check-routeros-update.md b/doc/check-routeros-update.md
index 926b4aaa..b6c716cb 100644
--- a/doc/check-routeros-update.md
+++ b/doc/check-routeros-update.md
@@ -99,6 +99,7 @@ startup is perfectly valid:
 See also
 --------
 
+* [Check perpetual license on CHR](check-perpetual-license.md)
 * [Automatically upgrade firmware and reboot](firmware-upgrade-reboot.md)
 * [Manage system update](packages-update.md)
 
diff --git a/doc/mod/notification-email.md b/doc/mod/notification-email.md
index 34d1c09e..7dd9a5e7 100644
--- a/doc/mod/notification-email.md
+++ b/doc/mod/notification-email.md
@@ -79,6 +79,7 @@ function available:
 See also
 --------
 
+* [Send notifications via Gotify](notification-gotify.md)
 * [Send notifications via Matrix](notification-matrix.md)
 * [Send notifications via Ntfy](notification-ntfy.md)
 * [Send notifications via Telegram](notification-telegram.md)
diff --git a/doc/mod/notification-gotify.d/appsetup.avif b/doc/mod/notification-gotify.d/appsetup.avif
new file mode 100644
index 00000000..55fccd01
Binary files /dev/null and b/doc/mod/notification-gotify.d/appsetup.avif differ
diff --git a/doc/mod/notification-gotify.md b/doc/mod/notification-gotify.md
new file mode 100644
index 00000000..6f617672
--- /dev/null
+++ b/doc/mod/notification-gotify.md
@@ -0,0 +1,90 @@
+Send notifications via Gotify
+===========================
+
+[![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
+[![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
+[![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.15-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
+[![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
+
+[⬅️ Go back to main README](../../README.md)
+
+> ℹ️️ **Info**: This module can not be used on its own but requires the base
+> installation. See [main README](../../README.md) for details.
+
+Description
+-----------
+
+This module adds support for sending notifications via
+[Gotify](https://gotify.net/). A queue is used to make sure
+notifications are not lost on failure but sent later.
+
+Requirements and installation
+-----------------------------
+
+Just install the module:
+
+    $ScriptInstallUpdate mod/notification-gotify;
+
+Also deploy the [Gotify server](https://github.com/gotify/server) and optionally install a Gotify client on your mobile device.
+
+Configuration
+-------------
+
+Follow the [installation instructions](https://gotify.net/docs/install) and the [First Login setup](https://gotify.net/docs/first-login). Once you have a user and account you can start creating apps. Each app is an independent notification feed for a device or application.
+
+![Create new app](notification-gotify.d/appsetup.avif)
+ 
+On creation apps are assigned a Token for authentification and you can also assign a default priority for each app.
+
+Edit `global-config-overlay`, add `GotifyServer` with your server address and `GotifyToken` with the token from your configured app on the Gotify server.
+Then reload the configuration.
+
+> ℹ️ **Info**: Copy relevant configuration from
+> [`global-config`](../../global-config.rsc) (the one without `-overlay`) to
+> your local `global-config-overlay` and modify it to your specific needs.
+
+For a custom service installing an additional certificate may be required.
+You may want to install that certificate manually, after finding the
+[certificate name from browser](../../CERTIFICATES.md).
+
+Usage and invocation
+--------------------
+
+There's nothing special to do. Every script or function sending a notification
+will now send it to your Gotify application feed.
+
+But of course you can use the function to send notifications directly. Give
+it a try:
+
+    $SendGotify "Subject..." "Body...";
+
+Alternatively this sends a notification with all available and configured
+methods:
+
+    $SendNotification "Subject..." "Body...";
+
+To use the functions in your own scripts you have to declare them first.
+Place this before you call them:
+
+    :global SendGotify;
+    :global SendNotification;
+
+In case there is a situation when the queue needs to be purged there is a
+function available:
+
+    $PurgeGotifyQueue;
+
+See also
+--------
+
+* [Certificate name from browser](../../CERTIFICATES.md)
+* [Send notifications via e-mail](notification-email.md)
+* [Send notifications via Matrix](notification-matrix.md)
+* [Send notifications via Ntfy](notification-ntfy.md)
+* [Send notifications via Telegram](notification-telegram.md)
+
+---
+[⬅️ Go back to main README](../../README.md)  
+[⬆️ Go back to top](#top)
diff --git a/doc/mod/notification-matrix.md b/doc/mod/notification-matrix.md
index 89c1b01d..b3df374a 100644
--- a/doc/mod/notification-matrix.md
+++ b/doc/mod/notification-matrix.md
@@ -131,6 +131,7 @@ See also
 
 * [Certificate name from browser](../../CERTIFICATES.md)
 * [Send notifications via e-mail](notification-email.md)
+* [Send notifications via Gotify](notification-gotify.md)
 * [Send notifications via Ntfy](notification-ntfy.md)
 * [Send notifications via Telegram](notification-telegram.md)
 
diff --git a/doc/mod/notification-ntfy.md b/doc/mod/notification-ntfy.md
index 51756ace..cfef7bbc 100644
--- a/doc/mod/notification-ntfy.md
+++ b/doc/mod/notification-ntfy.md
@@ -90,6 +90,7 @@ See also
 
 * [Certificate name from browser](../../CERTIFICATES.md)
 * [Send notifications via e-mail](notification-email.md)
+* [Send notifications via Gotify](notification-gotify.md)
 * [Send notifications via Matrix](notification-matrix.md)
 * [Send notifications via Telegram](notification-telegram.md)
 
diff --git a/doc/mod/notification-telegram.md b/doc/mod/notification-telegram.md
index 2d00116a..25585a6f 100644
--- a/doc/mod/notification-telegram.md
+++ b/doc/mod/notification-telegram.md
@@ -115,6 +115,7 @@ See also
 
 * [Chat with your router and send commands via Telegram bot](../telegram-chat.md)
 * [Send notifications via e-mail](notification-email.md)
+* [Send notifications via Gotify](notification-gotify.md)
 * [Send notifications via Matrix](notification-matrix.md)
 * [Send notifications via Ntfy](notification-ntfy.md)
 
diff --git a/global-config.rsc b/global-config.rsc
index fa32b163..42a457a5 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -63,6 +63,12 @@
 :global NtfyServerToken "";
 :global NtfyTopic "";
 
+# You can send Gotify notifications. Configure these settings and
+# install the module:
+# $ScriptInstallUpdate mod/notification-gotify
+:global GotifyServer "";
+:global GotifyToken "";
+
 # It is possible to override e-mail, Telegram, Matrix and Ntfy setting
 # for every script. This is done in arrays, where 'Override' is appended
 # to the variable name, like this:
diff --git a/global-functions.rsc b/global-functions.rsc
index 8ae7bb8e..8ade79bf 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -15,7 +15,7 @@
 # Git commit id & info, expected configuration version
 :global CommitId "unknown";
 :global CommitInfo "unknown";
-:global ExpectedConfigVersion 135;
+:global ExpectedConfigVersion 136;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;
diff --git a/logo.avif b/logo.avif
index 399a2f5a..956fea8a 100644
Binary files a/logo.avif and b/logo.avif differ
diff --git a/logo.png b/logo.png
index d97b75dc..7bec10e5 100644
Binary files a/logo.png and b/logo.png differ
diff --git a/mod/notification-gotify.rsc b/mod/notification-gotify.rsc
new file mode 100644
index 00000000..9925c9f5
--- /dev/null
+++ b/mod/notification-gotify.rsc
@@ -0,0 +1,143 @@
+#!rsc by RouterOS
+# RouterOS script: mod/notification-gotify
+# Copyright (c) 2025 Christian Hesse <mail@eworm.de>
+#                    Leonardo David Monteiro <leo@cub3.xyz>
+# https://rsc.eworm.de/COPYING.md
+#
+# requires RouterOS, version=7.15
+# requires device-mode, fetch, scheduler
+#
+# send notifications via Gotify
+# https://rsc.eworm.de/doc/mod/notification-ntfy.md
+
+:global FlushGotifyQueue;
+:global NotificationFunctions;
+:global PurgeGotifyQueue;
+:global SendGotify;
+:global SendGotify2;
+
+# flush Gotify queue
+:set FlushGotifyQueue do={
+  :do {
+    :global GotifyQueue;
+    :global IsFullyConnected;
+    :global LogPrint;
+
+    :if ([ $IsFullyConnected ] = false) do={
+      $LogPrint debug $0 ("System is not fully connected, not flushing.");
+      :return false;
+    }
+
+    :local AllDone true;
+    :local QueueLen [ :len $GotifyQueue ];
+
+    :if ([ :len [ /system/scheduler/find where name="_FlushGotifyQueue" ] ] > 0 && $QueueLen = 0) do={
+      $LogPrint warning $0 ("Flushing Gotify messages from scheduler, but queue is empty.");
+    }
+
+    :foreach Id,Message in=$GotifyQueue do={
+      :if ([ :typeof $Message ] = "array" ) do={
+        :do {
+          /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
+            http-header-field=($Message->"headers") http-data=[ :serialize to=json ($Message->"message") ] \
+            ($Message->"url") as-value;
+          :set ($GotifyQueue->$Id);
+        } on-error={
+          $LogPrint debug $0 ("Sending queued Gotify message failed.");
+          :set AllDone false;
+        }
+      }
+    }
+
+    :if ($AllDone = true && $QueueLen = [ :len $GotifyQueue ]) do={
+      /system/scheduler/remove [ find where name="_FlushGotifyQueue" ];
+      :set GotifyQueue;
+    }
+  } on-error={
+    :global ExitError; $ExitError false $0;
+  }
+}
+
+# send notification via Gotify - expects one array argument
+:set ($NotificationFunctions->"gotify") do={
+  :local Notification $1;
+
+  :global Identity;
+  :global IdentityExtra;
+  :global GotifyQueue;
+  :global GotifyServer;
+  :global GotifyServerOverride;
+  :global GotifyToken;
+  :global GotifyTokenOverride;
+
+  :global EitherOr;
+  :global LogPrint;
+  :global SymbolForNotification;
+
+  :local Server [ $EitherOr ($GotifyServerOverride->($Notification->"origin")) $GotifyServer ];
+  :local Token [ $EitherOr ($GotifyTokenOverride->($Notification->"origin")) $GotifyToken ];
+
+  :if ([ :len $Token ] = 0) do={
+    :return false;
+  }
+  :local Url ("https://" . $Server . "/message");
+
+  :local Headers ({ ("X-Gotify-Key: " . $Token);  "Content-Type: application/json" });
+
+  :local Message;
+  :if ([ :len [ :tostr ($Notification->"priority") ] ] > 0) do={
+    :set Message ({"title"="[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject");
+    "message"=($Notification->"message");
+    "priority"=$Priority });
+  } else={ 
+    :set Message ({"title"="[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject");
+    "message"=($Notification->"message")});
+  }
+  
+  :do {
+    /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
+      http-header-field=$Headers http-data=[:serialize to=json $Message] $Url as-value;
+  } on-error={
+    $LogPrint info $0 ("Failed sending Gotify notification! Queuing...");
+
+    :if ([ :typeof $GotifyQueue ] = "nothing") do={
+      :set GotifyQueue ({}); 
+    }
+    :set ($Message->"title") ("[Queued] " . ($Notification->"subject"));
+    :set ($Message->"message") (($Notification->"message") . "\n[This message was queued at " . \
+      [ /system/clock/get date ] . " " . [ /system/clock/get time ] . "]");
+    :set ($GotifyQueue->[ :len $GotifyQueue ]) { url=$Url; headers=$Headers; message=$Message };
+    :if ([ :len [ /system/scheduler/find where name="_FlushGotifyQueue" ] ] = 0) do={
+      /system/scheduler/add name="_FlushGotifyQueue" interval=1m start-time=startup \
+        on-event=(":global FlushGotifyQueue; \$FlushGotifyQueue;");
+    }
+  }
+}
+
+# purge the Gotify queue
+:set PurgeGotifyQueue do={
+  :global GotifyQueue;
+
+  /system/scheduler/remove [ find where name="_FlushGotifyQueue" ];
+  :set GotifyQueue;
+}
+
+# send notification via Gotify - expects at least two string arguments
+:set SendGotify do={ 
+  :do {
+    :global SendGotify2;
+
+    $SendGotify2 ({ origin=$0; subject=$1; message=$2; priority=$3 });
+  } on-error={
+    :global ExitError; $ExitError false $0;
+  }
+}
+
+# send notification via Gotify - expects one array argument
+:set SendGotify2 do={
+  :local Notification $1;
+
+  :global NotificationFunctions;
+
+  ($NotificationFunctions->"gotify") ("\$NotificationFunctions->\"gotify\"") $Notification;
+}
diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 68e913f6..5ef353b4 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -151,7 +151,8 @@
   :local ChatId [ $EitherOr ($Notification->"chatid") \
     [ $EitherOr ($TelegramChatIdOverride->($Notification->"origin")) $TelegramChatId ] ];
   :local ThreadId [ $EitherOr ($Notification->"threadid") \
-    [ $EitherOr ($TelegramThreadIdOverride->($Notification->"origin")) $TelegramThreadId ] ];
+    [ $EitherOr ($TelegramThreadIdOverride->($Notification->"origin")) \
+    [ $IfThenElse ([ :len ($TelegramChatIdOverride->($Notification->"origin")) ] = 0) $TelegramThreadId ] ] ];
   :local TokenId [ $EitherOr ($TelegramTokenIdOverride->($Notification->"origin")) $TelegramTokenId ];
 
   :if ([ :len $TokenId ] = 0 || [ :len $ChatId ] = 0) do={
diff --git a/news-and-changes.rsc b/news-and-changes.rsc
index 459326f3..55b41650 100644
--- a/news-and-changes.rsc
+++ b/news-and-changes.rsc
@@ -60,6 +60,7 @@
   133="Updated the default configuration for 'fw-addr-lists', deprecated lists were removed, a collective list was added.";
   134="Enhanced 'mod/notification-telegram' and 'telegram-chat' to support topics in groups.";
   135="Introduced helper function '\$GetTelegramChatId' for 'mod/notification-telegram' which helps retrieve information.";
+  136="Introduced script 'check-perpetual-license' to check for license state on CHR.";
 };
 
 # Migration steps to be applied on script updates