diff --git a/files/0001-Fix-zsh-and-fish.patch b/files/0001-Fix-zsh-and-fish.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Fix-zsh-and-fish.patch
@@ -0,0 +1,33 @@
+From 29308ee50d211f1209258061b25976bc36e14820 Mon Sep 17 00:00:00 2001
+From: Troy Harvey <harveydevel@gmail.com>
+Date: Sun, 23 Jan 2022 10:53:26 +1100
+Subject: [PATCH] Fix zsh and fish
+
+---
+ data/scripts/Xsession | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index 5449810..27f8887 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -21,7 +21,7 @@ case $SHELL in
+     ;;
+ */zsh)
+     [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+-    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
++    [ -d /usr/share/defaults/etc/zsh ] && zdir=/usr/share/defaults/etc/zsh
+     zhome=${ZDOTDIR:-$HOME}
+     # zshenv is always sourced automatically.
+     [ -f $zdir/zprofile ] && . $zdir/zprofile
+@@ -39,6 +39,7 @@ case $SHELL in
+     rm -f $xsess_tmp
+     ;;
+   */fish)
++    [ -f /usr/share/defaults/etc/profile ] && . /usr/share/defaults/etc/profile
+     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
+     . $xsess_tmp
+-- 
+2.34.0
+
diff --git a/files/0002-Fix-zsh-for-solus.patch b/files/0002-Fix-zsh-for-solus.patch
deleted file mode 100644
--- a/files/0002-Fix-zsh-for-solus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From dceea3f8b880c4eaefdb9647fe7755ac5a658ee5 Mon Sep 17 00:00:00 2001
-From: Troy Harvey <harveydev@protonmail.com>
-Date: Thu, 20 Feb 2020 22:26:39 +1100
-Subject: [PATCH] Fix zsh for solus
-
----
- data/scripts/Xsession | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/scripts/Xsession b/data/scripts/Xsession
-index c7fa214..658c3a9 100755
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -21,7 +21,7 @@ case $SHELL in
-     ;;
- */zsh)
-     [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
--    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
-+    [ -d /usr/share/defaults/etc/zsh ] && zdir=/usr/share/defaults/etc/zsh
-     zhome=${ZDOTDIR:-$HOME}
-     # zshenv is always sourced automatically.
-     [ -f $zdir/zprofile ] && . $zdir/zprofile
--- 
-2.25.1
-
diff --git a/files/series b/files/series
--- a/files/series
+++ b/files/series
@@ -1,7 +1,7 @@
 0001-Source-usr-share-defaults-etc-xprofile.patch
 0001-Use-Solus-defaults.patch
 0002-Fix-session-started-as-the-wrong-type-on-autologin.patch
-0002-Fix-zsh-for-solus.patch
+0001-Fix-zsh-and-fish.patch
 merge-paths-in-xorgdisplayserver.patch
 retry-starting-display-server.patch
 sddm-fix-build.patch
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : sddm
 version    : 0.19.0
-release    : 29
+release    : 30
 source     :
     - https://github.com/sddm/sddm/archive/refs/tags/v0.19.0.tar.gz : e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41
 license    :
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -230,8 +230,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="29">
-            <Date>2021-11-09</Date>
+        <Update release="30">
+            <Date>2022-01-23</Date>
             <Version>0.19.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Troy Harvey</Name>