diff --git a/fish-grep-1.patch b/fish-grep-1.patch
new file mode 100644
index 0000000..34dd74a
--- /dev/null
+++ b/fish-grep-1.patch
@@ -0,0 +1,28 @@
+From efc3846fcfa6f0bae8312645c41b132c6156b3d1 Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Tue, 25 Nov 2014 08:47:30 +0800
+Subject: [PATCH] grep.fish: don't use GREP_OPTIONS as it is deprecated
+
+Closes #1825.
+---
+ share/functions/grep.fish | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index b0dc9586ce21..cd7c31baffcf 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null
+ 	if not set -q GREP_COLOR
+ 		set -gx GREP_COLOR '97;45'
+ 	end
+-	if not set -q GREP_OPTIONS
+-		set -gx GREP_OPTIONS --color=auto
++	function grep
++		command grep --color=auto $argv
+ 	end
+ end
+ 
+-- 
+2.1.0
+
diff --git a/fish-grep-2.patch b/fish-grep-2.patch
new file mode 100644
index 0000000..4d214f0
--- /dev/null
+++ b/fish-grep-2.patch
@@ -0,0 +1,29 @@
+From 190cac07a3ff7cd2c65ac24b600808e7c1674412 Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Tue, 25 Nov 2014 08:48:10 +0800
+Subject: [PATCH] grep.fish: don't set GREP_COLOR
+
+grep will fall back to the default colors.
+
+Closes #1316.
+---
+ share/functions/grep.fish | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index cd7c31baffcf..73f21922dc6f 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -3,9 +3,6 @@
+ #
+ 
+ if command grep --color=auto --help 1>/dev/null 2>/dev/null
+-	if not set -q GREP_COLOR
+-		set -gx GREP_COLOR '97;45'
+-	end
+ 	function grep
+ 		command grep --color=auto $argv
+ 	end
+-- 
+2.1.0
+
diff --git a/fish.spec b/fish.spec
index 0bcaf39..76add22 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,6 +1,6 @@
 Name:                   fish
 Version:                2.1.1
-Release:                1%{?dist}
+Release:                2%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
@@ -10,6 +10,8 @@ Source0:                http://fishshell.com/files/%{version}/fish-%{version}.ta
 Patch0:                 fish-remove-usr-local.patch
 Patch1:                 fish-add-link-cxxflags.patch
 Patch2:                 fish-use-usrbinpython.patch
+Patch3:                 fish-grep-1.patch
+Patch4:                 fish-grep-2.patch
 
 BuildRequires:          ncurses-devel gettext groff doxygen
 
@@ -25,6 +27,8 @@ nothing to learn or configure.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # This is unused.  If we fiddle with Python versions, its presence will
 # be confusing.
@@ -77,6 +81,9 @@ fi
 
 
 %changelog
+* Sun Dec 14 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-2
+- Backport grep.fish fixes (rhbz #1173924)
+
 * Mon Sep 29 2014 Andy Lutomirski <luto@mit.edu> - 2.1.1-1
 - Update to 2.1.1