diff --git a/fish-3.6.4.tar.xz b/fish-3.6.4.tar.xz
deleted file mode 100644
index 2d96838..0000000
--- a/fish-3.6.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f3f610e580de092fbe882c8aa76623ecf91bb16fdf0543241e6e90d5d4bc393
-size 2911364
diff --git a/fish-3.6.4.tar.xz.asc b/fish-3.6.4.tar.xz.asc
deleted file mode 100644
index 7bfdafb..0000000
--- a/fish-3.6.4.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEnh3gZzzMAykZ0YUmwLlpspdOiI4FAmVvM/MACgkQwLlpspdO
-iI5Tnw/+LaEsY3oiE3WPLgoDphzZ93T/qq7E5v4Xdna9k+stvujCykKCuVzbiQ2i
-kr1ISa2nobYmMN73Fbpxc9hiISwaG47Wz3nZuIDmKRsEonzxRA8YY8NqobJ3yXH5
-UtIdwzhR3nY91a4py8fBt/jjUXGK+W5RvbHSaP3i3hHQZaSQPlOZ7B3aByhtkYSt
-9HIZAUBM1FshLmuaGOJFzTvmutOvlvf4z0Bt147biE+wogdhaaGTEfrlkKml3TbK
-kBPIjTUAHFMPkZ+XjSPyzsCCD+zvyW9oDSuuXhYvmpGUOSAd+4Efmcp6zVNewAlV
-el94tDhRxLBpm1J42hQO2ie/zMtbx8zBBZ4jqB1YdoqoR1a9ELFlTcOGEY0cPxVg
-bb1cZ4K+XgLMHCVWEUWV9nNRCcaup5Uydr09CH/aQOdlt+is6M0Gl/iKZnOnx4Mr
-yeq4bDnc487UbJoIw4WTsNH9muHPD1Z2qNUvtmDhbkTdFxDUkh0TpFa7de+gqKJI
-DKtaN8fqsGzw7B4+xY7VlnLUePJNgZ6lrlA9XgRwuOa1quhdAt+AVAoF0MB2bSLv
-EGB7FJ3ID78bbznf8EOrKM4lPCJcVv6093cuE+SSNSiQv90wjgm4a46yHnYYCjNG
-nfFTtKDw0NjgXZWlxnfDk0Xj4QHqv5BTD6jbtvV97vbFWwbojpY=
-=mUGV
------END PGP SIGNATURE-----
diff --git a/fish-3.7.0.tar.xz b/fish-3.7.0.tar.xz
new file mode 100644
index 0000000..de0ee89
--- /dev/null
+++ b/fish-3.7.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df1b7378b714f0690b285ed9e4e58afe270ac98dbc9ca5839589c1afcca33ab1
+size 2961912
diff --git a/fish-3.7.0.tar.xz.asc b/fish-3.7.0.tar.xz.asc
new file mode 100644
index 0000000..33b3c87
--- /dev/null
+++ b/fish-3.7.0.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEnh3gZzzMAykZ0YUmwLlpspdOiI4FAmWS2T0ACgkQwLlpspdO
+iI6xuxAAgnfuw5wiMbIPrjGrLuFnKEYSSEmP0mD5qFfsUqeXOJFWao2fnG0R19FI
+XE3s1SywgIpT4Qqr6+Q48FgmokmUDFsV6pnqiyUZfUBbWWYBefyeFf6JMGAxB/Dd
+LhOiEBTd5Xv+Y0eDCJuwA1k3TRMXxErgS9AxfEbdb3bZy6Hp21XpaGCfoRFTuMG+
+34DfkMd8CPvWKrfvpO1A7gj3o1QbmXxamrR85wyvJPS1fZOeUw5Nl6GE7yKoulRT
+l5z6jTOpUEHud65qYYA4j9sEJXAVFaPJcO6SKQw/fNPS2fH/4ZapVOjPBnUdbK/n
+Ds9rhoH9NyX23ZXJvTig+ajeIK1O8vCiCAeV5ep3667vOJY1Zec8U3sxqSOGd0yG
+RVgnF2GmfQE8U8zy/9RESnyLZPTCB5o1gJ2Yfl8E+K6zI1JzW5mqK2D0hrLS4Z7T
+2eUYH6D0n77m4hbIoKn5vivvxxSLwJbWrt/lacYi5AF3/WbksPhmCSyGoOSSelN8
+vh6TS3m2V+blwYZujXmHvOYRxTxOT004nEtA6djvAEIocHpmjNTzhr6KzTd31Y6V
+OB8UPI+rVVdDABRxwQZaaOaIPXtSrLiti3OzOVvQI9xSmmMHq/SYXd7Lyb/XTRxY
+HA8eLmbPj3NTA832hoJcLpMxGhCo/VU4P8ctI2FRKyn1ykWNNBg=
+=QMS3
+-----END PGP SIGNATURE-----
diff --git a/fish.changes b/fish.changes
index 44bf051..eb55ce7 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Jan 30 10:17:54 UTC 2024 - Simon Lees <sflees@suse.de>
+
+- Fix changelog timestamp in the last entry
+- Hard code rather then use -DCMAKE_INSTALL_DOCDIR:PATH=%{__cmake_make_prefix_relative %{_docdir}/%{name}
+  It was causing issues with the 15.5 build
+
+-------------------------------------------------------------------
+Wed Jan 24 14:38:01 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix build to cope with changes in (open)SUSE specific cmake
+  macros, move documentation to canonical location.
+
+-------------------------------------------------------------------
+Mon Jan 1 18:42:02 UTC 2024 - Victorhck <victorhck@opensuse.org>
+
+- Update to 3.7.0:  
+  * The history pager will now also attempt subsequence matches (#9476),
+    so you can find a command line like git log 3.6.1..Integration_3.7.0 by searching for gitInt.
+  * Opening the history pager will now fill the search field with a search string if you’re already
+    in a search (#10005). This makes it nicer to search something with ↑ and then later decide 
+    to switch to the full pager.
+  * Closing the history pager with enter will now copy the search text to the commandline 
+    if there was no match, so you can continue editing the command you tried to find right away (#9934).
+  * Performance improvements for command completions and globbing, where supported by the operating system,
+    especially on slow filesystems such as NFS (#9891, #9931, #10032, #10052).
+  * fish can now be configured to wait a specified amount of time for a multi-key sequence to be completed,
+    instead of waiting indefinitely. For example, this makes binding kj to switching modes in vi mode possible.
+    The timeout can be set via the new fish_sequence_key_delay_ms variable (#7401),
+    and may be set by default in future versions.
+  * See https://github.com/fish-shell/fish-shell/releases/tag/3.7.0 
+    for more details
+
 -------------------------------------------------------------------
 Wed Dec  6 12:42:56 UTC 2023 - Dan Čermák <dcermak@suse.com>
 
diff --git a/fish.spec b/fish.spec
index 8fa796b..3a8fd00 100644
--- a/fish.spec
+++ b/fish.spec
@@ -17,7 +17,7 @@
 
 
 Name:           fish
-Version:        3.6.4
+Version:        3.7.0
 Release:        0
 Summary:        The "friendly interactive shell"
 # see bundled doc_src/license.rst
@@ -67,14 +67,18 @@ find share/tools -type f -name *.py -exec \
 %cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
+    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
+    -DCMAKE_INSTALL_DOCDIR:PATH=share/doc/packages/fish \
+    %{nil}
+%cmake_build
 
 %install
 %cmake_install
 
 %find_lang %{name}
 
-rm %{buildroot}/%{_datadir}/doc/fish/.buildinfo
+# Location varies between TW and SLE/Leap, try both
+rm %{buildroot}/%{_datadir}/doc/packages/fish/.buildinfo
 
 %suse_update_desktop_file -G "Command-line interpreter" fish TerminalEmulator
 
@@ -102,7 +106,7 @@ fi
 %{_bindir}/fish
 %{_bindir}/fish_indent
 %{_bindir}/fish_key_reader
-%{_datadir}/doc/%{name}
+%doc %{_datadir}/doc/packages/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man1/*.1%{?ext_man}
 %{_datadir}/applications/fish.desktop