diff -Nru snapd-2.54.3+18.04.2ubuntu0.1/data/env/snapd.fish.in snapd-2.54.3+18.04.2ubuntu0.2/data/env/snapd.fish.in
--- snapd-2.54.3+18.04.2ubuntu0.1/data/env/snapd.fish.in	2022-02-18 14:06:51.000000000 +0000
+++ snapd-2.54.3+18.04.2ubuntu0.2/data/env/snapd.fish.in	2022-02-23 18:29:01.000000000 +0000
@@ -8,7 +8,16 @@
 # looked for in XDG_DATA_DIRS; make sure it includes the relevant directory for
 # snappy applications' desktop files.
 set -ul snap_xdg_path /var/lib/snapd/desktop
-set --path --export XDG_DATA_DIRS $XDG_DATA_DIRS
-if not contains $snap_xdg_path $XDG_DATA_DIRS
-    set XDG_DATA_DIRS $XDG_DATA_DIRS $snap_xdg_path
+# note, snapd supports distros going back as far as Ubuntu 16.04, what means we
+# must make sure that this is compatible with old fish shells which do not have
+# fish_add_path or set --path
+
+if not set -q XDG_DATA_DIRS
+    set --global --export XDG_DATA_DIRS $XDG_DATA_DIRS
+    # XDG_DATA_DIRS is not defined, set it to some reasonable defaults
+    set XDG_DATA_DIRS (string join : /usr/local/share /usr/share)
+end
+
+if not contains $snap_xdg_path (string split : "$XDG_DATA_DIRS")
+    set XDG_DATA_DIRS (string join : -- $XDG_DATA_DIRS $snap_xdg_path)
 end
diff -Nru snapd-2.54.3+18.04.2ubuntu0.1/debian/changelog snapd-2.54.3+18.04.2ubuntu0.2/debian/changelog
--- snapd-2.54.3+18.04.2ubuntu0.1/debian/changelog	2022-02-18 14:06:51.000000000 +0000
+++ snapd-2.54.3+18.04.2ubuntu0.2/debian/changelog	2022-02-23 18:29:05.000000000 +0000
@@ -1,3 +1,12 @@
+snapd (2.54.3+18.04.2ubuntu0.2) bionic-security; urgency=medium
+
+  * SECURITY REGRESSION: Fix fish shell compatibility
+    - data/env/snapd.fish.in: more workarounds for even older fish shells,
+      provide reasonable defaults.
+    - LP: #1961791
+
+ -- Paulo Flabiano Smorigo <pfsmorigo@canonical.com>  Wed, 23 Feb 2022 18:29:05 +0000
+
 snapd (2.54.3+18.04.2ubuntu0.1) bionic-security; urgency=medium
 
   * SECURITY REGRESSION: Fix fish shell compatibility
diff -Nru snapd-2.54.3+18.04.2ubuntu0.1/packaging/ubuntu-16.04/changelog snapd-2.54.3+18.04.2ubuntu0.2/packaging/ubuntu-16.04/changelog
--- snapd-2.54.3+18.04.2ubuntu0.1/packaging/ubuntu-16.04/changelog	2022-02-18 14:06:51.000000000 +0000
+++ snapd-2.54.3+18.04.2ubuntu0.2/packaging/ubuntu-16.04/changelog	2022-02-23 18:29:05.000000000 +0000
@@ -1,3 +1,12 @@
+snapd (2.54.3+18.04.2ubuntu0.2) bionic-security; urgency=medium
+
+  * SECURITY REGRESSION: Fix fish shell compatibility
+    - data/env/snapd.fish.in: more workarounds for even older fish shells,
+      provide reasonable defaults.
+    - LP: #1961791
+
+ -- Paulo Flabiano Smorigo <pfsmorigo@canonical.com>  Wed, 23 Feb 2022 18:29:05 +0000
+
 snapd (2.54.3+18.04.2ubuntu0.1) bionic-security; urgency=medium
 
   * SECURITY REGRESSION: Fix fish shell compatibility