diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 2cc1cee..a7e9361 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,6 @@
 AUX fish-2.1.0-putty-xterm.patch 1627 SHA256 2db412f96a3a1d59c252b7c1032fb0428cc0ba1b9864ebe9215e4f5025b72ddb SHA512 f1d7e0d56b6a223068e8fd6f3f5ba6409f59a793abefa2ec6d57e41c25070dbf6bd037ab4bf1a9c86f217e048062b799a9aa55dc89616c2b06859c06765b3fcf WHIRLPOOL 00a85722ff9631e5de0ae8964f11c27be77302e2d407f52555a48175c7269f966644f109da5caceac7ac9d57490c07210466b821727f8fd0c44a7fbc9e7c14da
 AUX fish-2.1.0-tinfo.patch 1037 SHA256 eb6c44ec4d5ece0dbe305112504083f011b3999c274fc86786a7bf9c5ee967b4 SHA512 8ec3c9a003f30a4e05685de1492bc3a795dbbdb1cd5ab95769fc3a8f9df478e15f64a12730e71ed4d2485867c0a59268620ef3ef08982d0a481282f9a20d59a8 WHIRLPOOL e594423661107afb10b09acac4026c58ad708eac27ae3781dd4056a8ddc29d7b12fba66709fc0077f5645905907b00a849515e9a0e3c98a035920177363f46ec
+AUX fish-2.1.1-fix-grep-usage.patch 437 SHA256 1c4fcdd129975d92ac4bf75ee4bf04195cb8443e51bccdf6ade93ac8c5400ec5 SHA512 5c677425dd0a885f1342ebb79bb33132a16774325f99dd9dc7a5ad6b3aab1f3ea874e64985a4f60a2eb2d0435b7d16485de37d5f7e1feb126f115bce96fbed7e WHIRLPOOL 5af8085d49542c3130547054b19cd5c90ccfb0a424adf605ba18ab4c96141de51ed8ed1c551649af05a82a5ae63a2ae8f007f91012961dfbd4a1d93539fea555
 AUX fish_prompt_mark.fish 2741 SHA256 ce5a49cdf7d08134a4f0e537a84f7474d366860f7c2e2b23acee1dd7a77f2de9 SHA512 9b52ff1654a3c110622616cd23753aa47c5e38e049c9644acaad6b26af7a2e6c39bff2c54fe522c9053853ee2f935546367dddb5a520719d4ee9f701bda68deb WHIRLPOOL c6362ae10322011ead9268a9cc39bcafeae335e2a6dcb0afad3d25aab58ef32c4b5d31de7596a5c12d9e20211fc7f5d56a71cd13a22373ed5fc8939d6d38225c
 DIST fish-2.1.2.tar.gz 1730198 SHA256 c6c20d5ca3a2a0168461de8abfe85f9e6b255132698ea0109998d4ab68f9f6dd SHA512 4f8f0133094d4d2295546a5b96e044646de2266364610368210b0db529b2d865c1b389f01f311b9b6d6d6dcd2a29040b7a9499d491605ae52a765a76d83db2a5 WHIRLPOOL 2a02dd0f91731cfc79de64245c34fc4361f42406d0c0a60afbafa08c2b9265d11c4adadc96ca5eb49b9053db1eb949c297eee23a7cbc63a30f56ce577b650779
-EBUILD fish-2.1.2.ebuild 2460 SHA256 50f3000782aa9dbfa3955182186f8d3568325c0b3760c0a4fc7c08b44cfa17f0 SHA512 08286eb104b93c5e46e88a0a5b1d8ac4da579b74e097b46d5fae2b24a4031e43b2d2696c540e59da0e349aeed850175c2d83368c59b141d417ae77e503ce3a1c WHIRLPOOL eff4d85d959cab40e8fd158bc270b8a4231896afc15862dc8766d81666ab62d59faaaca0fa42a8f9957eb34fd5432f78a6e42a70ef5bc2e943d6e41e83e89bd7
+EBUILD fish-2.1.2.ebuild 2515 SHA256 9a03df010067853e13a796b3f8459d54a08ae646d2749fd7cae65ad1c46ace76 SHA512 7bf49b1f1cf961652a217d287ba68e1b8a4ffba47be7b6b4664d4407133d1886cfd244cd424673f6ea345117f7adf3d949a970dab0a0b04e161133d1fb1de6d3 WHIRLPOOL ee844abe0675c37687e2b34e03b52894b7431cda4553d016f81d8801abf504826a5401794d819c21b22ae578c23e6363278c5d4ecd8b5c65852c3661069a3af5
diff --git a/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch b/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
new file mode 100644
index 0000000..aea1760
--- /dev/null
+++ b/app-shells/fish/files/fish-2.1.1-fix-grep-usage.patch
@@ -0,0 +1,18 @@
+diff --git a/share/functions/grep.fish b/share/functions/grep.fish
+index b0dc958..73f2192 100644
+--- a/share/functions/grep.fish
++++ b/share/functions/grep.fish
+@@ -3,11 +3,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
+ 
diff --git a/app-shells/fish/fish-2.1.2.ebuild b/app-shells/fish/fish-2.1.2.ebuild
index 1d8a64b..5ebf79e 100644
--- a/app-shells/fish/fish-2.1.2.ebuild
+++ b/app-shells/fish/fish-2.1.2.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-tinfo.patch #459768
 	epatch "${FILESDIR}"/${PN}-2.1.0-putty-xterm.patch
+	epatch "${FILESDIR}"/${PN}-2.1.1-fix-grep-usage.patch
 	mv share/functions/fish_prompt.fish share/tools/web_config/sample_prompts/
 	cp "${FILESDIR}"/fish_prompt_mark.fish share/functions/fish_prompt.fish