diff --git a/fish-3.0.2.tar.gz b/fish-3.0.2.tar.gz
deleted file mode 100644
index 29cb0ad..0000000
--- a/fish-3.0.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14728ccc6b8e053d01526ebbd0822ca4eb0235e6487e832ec1d0d22f1395430e
-size 6477869
diff --git a/fish-3.1.0.tar.gz b/fish-3.1.0.tar.gz
new file mode 100644
index 0000000..1398cdf
--- /dev/null
+++ b/fish-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e5db1e6839685c56f172e1000c138e290add4aa521f187df4cd79d4eab294368
+size 6810953
diff --git a/fish.changes b/fish.changes
index 6b684ce..74d53a3 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon Mar 16 14:09:10 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 3.1.0
+* A new $pipestatus variable contains a list of exit statuses
+  of the previous job, for each of the separate commands in a pipeline
+* fish no longer buffers pipes to the last function in a pipeline,
+  improving many cases where pipes appeared to block or hang
+* cd now always looks for its argument in the current directory as a 
+  last resort, even if the CDPATH variable does not include it or "."
+* fish's debugging arguments have been significantly improved
+* new builtin command, time, which allows timing of fish functions
+  and builtins as well as external commands 
+* Brace expansion now only takes place if the braces include a "," or
+  a variable expansion, meaning common commands such as
+  git reset HEAD@{0} do not require escaping
+* many other fixes and improvements
+
 -------------------------------------------------------------------
 Wed Apr 10 00:03:00 UTC 2019 - Simon Lees <sflees@suse.de>
 
diff --git a/fish.spec b/fish.spec
index 7b65282..0ba2f11 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fish
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,14 @@
 
 
 Name:           fish
-Version:        3.0.2
+Version:        3.1.0
 Release:        0
 Summary:        The "friendly interactive shell"
 License:        GPL-2.0-only
 Group:          System/Shells
-Url:            https://fishshell.com/
+URL:            https://fishshell.com/
 Source:         https://github.com/fish-shell/fish-shell/releases/download/%{version}/fish-%{version}.tar.gz
+BuildRequires:  cmake
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  gettext
@@ -56,18 +57,22 @@ This package contains development files for the fish shell.
 find share/tools -type f -name *.py -exec sed -i -r '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} +
 
 %build
-%configure \
-  --without-included-pcre2
-make %{?_smp_mflags}
+%cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+    -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
 
 %install
-%make_install
+%cmake_install
 
 %find_lang %{name}
 
 # Drop the curl completions, the curl packages provide a better version
 rm %{buildroot}/%{_datadir}/fish/completions/curl.fish
 
+rm %{buildroot}/%{_datadir}/doc/fish/.buildinfo
+rm -r %{buildroot}/%{_datadir}/%{name}/man
+
 %post
 # Add fish to the list of allowed shells in /etc/shells
 if ! grep -q '^%{_bindir}/%{name}$' %{_sysconfdir}/shells; then