diff --git a/8784-old-school-cmd-subst.patch b/8784-old-school-cmd-subst.patch
new file mode 100644
index 0000000..1dedb73
--- /dev/null
+++ b/8784-old-school-cmd-subst.patch
@@ -0,0 +1,24 @@
+From 0c5a13346cd2a09125b3c24e24855723bca8679d Mon Sep 17 00:00:00 2001
+From: Fabian Homborg <FHomborg@gmail.com>
+Date: Sun, 13 Mar 2022 20:00:02 +0100
+Subject: [PATCH] Use old-school "()" command substitution in fish_title
+
+Because we reload changed function files, a common issue on upgrading
+to 3.4.0 is that fish_title causes errors.
+
+So we simply use the oldschool syntax.
+---
+ share/functions/fish_title.fish |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/share/functions/fish_title.fish
++++ b/share/functions/fish_title.fish
+@@ -4,7 +4,7 @@ function fish_title
+         # If we're connected via ssh, we print the hostname.
+         set -l ssh
+         set -q SSH_TTY
+-        and set ssh "[$(prompt_hostname | string sub -l 10)]"
++        and set ssh "["(prompt_hostname | string sub -l 10 | string collect)"]"
+         # An override for the current command is passed as the first parameter.
+         # This is used by `fg` to show the true process name, among others.
+         if set -q argv[1]
diff --git a/fish.changes b/fish.changes
index 1029cf8..96f1c87 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 21 13:20:42 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Add 8784-old-school-cmd-subst.patch fixing fish_title.fish
+
 -------------------------------------------------------------------
 Wed Mar 16 06:35:37 UTC 2022 - pgajdos@suse.com
 
diff --git a/fish.spec b/fish.spec
index a924d4d..8804708 100644
--- a/fish.spec
+++ b/fish.spec
@@ -25,6 +25,9 @@ Group:          System/Shells
 URL:            https://fishshell.com/
 Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz
 Source1:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.xz.asc
+# PATCH-FIX-UPSTREAM 8784-old-school-cmd-subst.patch gh#fish-shell/fish-shell#8784 mcepl@suse.com
+# Fix a syntax error (fish != bash)
+Patch0:         8784-old-school-cmd-subst.patch
 BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -52,7 +55,7 @@ Group:          Development/Libraries/C and C++
 This package contains development files for the fish shell.
 
 %prep
-%setup -q
+%autosetup -p1
 
 # fix E: env-script-interpreter
 find share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} +