diff --git a/.gitignore b/.gitignore
index 80cb010..fdc63ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /fish-2.7.1.tar.gz
 /fish-3.0.0.tar.gz
 /fish-3.0.2.tar.gz
+/fish-3.1.0.tar.gz
diff --git a/0001-Don-t-use-less-in-highlighting-test.patch b/0001-Don-t-use-less-in-highlighting-test.patch
deleted file mode 100644
index bb7462c..0000000
--- a/0001-Don-t-use-less-in-highlighting-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 742fde0dd68858ad603b449501f0c42cd7864fab Mon Sep 17 00:00:00 2001
-From: Fabian Homborg <FHomborg@gmail.com>
-Date: Fri, 28 Dec 2018 17:57:53 +0100
-Subject: [PATCH] Don't use less in highlighting test
-
-It doesn't have to be installed.
-
-`cat` is in our dependencies, so we can assume it's there.
-
-Fixes #5436.
----
- src/fish_tests.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
-index f6094254..abe21a2e 100644
---- a/src/fish_tests.cpp
-+++ b/src/fish_tests.cpp
-@@ -4243,7 +4243,8 @@ static void test_highlighting() {
-         {L"cat", highlight_spec_command},
-         {L"/dev/null", highlight_spec_param},
-         {L"|", highlight_spec_statement_terminator},
--        {L"less", highlight_spec_command},
-+        // This is bogus, but we used to use "less" here and that doesn't have to be installed.
-+        {L"cat", highlight_spec_command},
-         {L"2>", highlight_spec_redirection},
-     });
- 
--- 
-2.20.1
-
diff --git a/0001-iothread-Add-missing-cstdint-include.patch b/0001-iothread-Add-missing-cstdint-include.patch
new file mode 100644
index 0000000..a6988d3
--- /dev/null
+++ b/0001-iothread-Add-missing-cstdint-include.patch
@@ -0,0 +1,28 @@
+From 24e6cfa8097b8946db51f4076b59496a658fcbf5 Mon Sep 17 00:00:00 2001
+From: Igor Raits <i.gnatenko.brain@gmail.com>
+Date: Fri, 14 Feb 2020 20:45:19 +0100
+Subject: [PATCH] iothread: Add missing cstdint include
+
+This will fix build with GCC 10+.
+
+Fixes: https://github.com/fish-shell/fish-shell/issues/6604
+Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
+---
+ src/iothread.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/iothread.h b/src/iothread.h
+index 5d91b2b34..64f783e87 100644
+--- a/src/iothread.h
++++ b/src/iothread.h
+@@ -4,6 +4,7 @@
+ 
+ #include <pthread.h>
+ 
++#include <cstdint>
+ #include <functional>
+ #include <type_traits>
+ 
+-- 
+2.25.0
+
diff --git a/fish.spec b/fish.spec
index 615c602..a2056b0 100644
--- a/fish.spec
+++ b/fish.spec
@@ -3,8 +3,8 @@
 %global _python_bytecompile_extra 1
 
 Name:           fish
-Version:        3.0.2
-Release:        3%{?dist}
+Version:        3.1.0
+Release:        1%{?dist}
 Summary:        Friendly interactive shell
 
 # GPLv2
@@ -27,8 +27,7 @@ Summary:        Friendly interactive shell
 License:        GPLv2 and BSD and ISC and LGPLv2+ and MIT
 URL:            https://fishshell.com
 Source0:        https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/fish-shell/fish-shell/commit/742fde0dd68858ad603b449501f0c42cd7864fab
-Patch0001:      0001-Don-t-use-less-in-highlighting-test.patch
+Patch0001:      0001-iothread-Add-missing-cstdint-include.patch
 
 BuildRequires:  cmake >= 3.2
 BuildRequires:  ninja-build
@@ -46,6 +45,8 @@ Recommends:     man-db
 Recommends:     man-pages
 Recommends:     groff-base
 
+Provides:       bundled(js-angular) = 1.0.8
+
 %description
 fish is a fully-equipped command line shell (like bash or zsh) that is
 smart and user-friendly. fish supports powerful features like syntax
@@ -109,6 +110,9 @@ fi
 %{_pkgdocdir}
 
 %changelog
+* Sat Feb 15 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 3.1.0-1
+- Update to 3.1.0
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 66c0607..4092e8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fish-3.0.2.tar.gz) = cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
+SHA512 (fish-3.1.0.tar.gz) = 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff