diff --git a/.gitignore b/.gitignore
index f2d7dc9..887a019 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /fish-2.1.0.tar.gz
 /fish-2.1.1.tar.gz
+/fish-2.2.0.tar.gz
diff --git a/fish-add-link-cxxflags.patch b/fish-add-link-cxxflags.patch
deleted file mode 100644
index bd1e5ca..0000000
--- a/fish-add-link-cxxflags.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- fish-2.1.0/Makefile.in.orig	2013-12-13 09:12:28.963387757 -0800
-+++ fish-2.1.0/Makefile.in	2013-12-13 09:12:55.599383681 -0800
-@@ -742,7 +742,7 @@
- #
- 
- fish: $(FISH_OBJS) fish.o
--	$(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
-+	$(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
- 
- 
- #
-@@ -750,7 +750,7 @@
- #
- 
- fish_pager: $(FISH_PAGER_OBJS)
--	$(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
-+	$(CXX) $(CXXFLAGS) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
- 
- 
- #
-@@ -758,7 +758,7 @@
- #
- 
- fishd: $(FISHD_OBJS)
--	$(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
-+	$(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
- 
- 
- #
-@@ -766,7 +766,7 @@
- #
- 
- fish_tests: $(FISH_TESTS_OBJS)
--	$(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
-+	$(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
- 
- 
- #
-@@ -776,7 +776,7 @@
- #
- 
- mimedb: $(MIME_OBJS)
--	$(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
-+	$(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
- 
- 
- #
-@@ -784,7 +784,7 @@
- #
- 
- fish_indent: $(FISH_INDENT_OBJS)
--	$(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
-+	$(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
- 
- 
- #
-@@ -792,7 +792,7 @@
- #
- 
- key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o
--	$(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
-+	$(CXX) $(CXXFLAGS) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
- 
- 
- #
diff --git a/fish-grep-1.patch b/fish-grep-1.patch
deleted file mode 100644
index 34dd74a..0000000
--- a/fish-grep-1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 4d214f0..0000000
--- a/fish-grep-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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-remove-usr-local.patch b/fish-remove-usr-local.patch
deleted file mode 100644
index 233f6df..0000000
--- a/fish-remove-usr-local.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- fish-2.1.0/configure.orig	2013-12-13 09:08:36.716424191 -0800
-+++ fish-2.1.0/configure	2013-12-13 09:09:04.875419686 -0800
-@@ -2922,7 +2922,10 @@
- #
- # It also helps FreeBSD which puts libiconv in /usr/local/lib
- 
--for i in /usr/pkg /sw /opt /opt/local /usr/local; do
-+# This is problematic for RPM, though -- builds have no business
-+# looking in /usr/local.
-+
-+for i in ; do
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i/include include directory" >&5
- $as_echo_n "checking for $i/include include directory... " >&6; }
diff --git a/fish-use-usrbinpython.patch b/fish-use-usrbinpython.patch
deleted file mode 100644
index f460492..0000000
--- a/fish-use-usrbinpython.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up fish-2.1.0/share/tools/create_manpage_completions.py.orig fish-2.1.0/share/tools/create_manpage_completions.py
---- fish-2.1.0/share/tools/create_manpage_completions.py.orig	2013-10-19 13:10:26.000000000 -0700
-+++ fish-2.1.0/share/tools/create_manpage_completions.py	2013-12-13 09:35:05.528351152 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- coding: utf-8 -*-
- 
- # Run me like this: ./create_manpage_completions.py /usr/share/man/man{1,8}/* > man_completions.fish
-diff -up fish-2.1.0/share/tools/deroff.py.orig fish-2.1.0/share/tools/deroff.py
---- fish-2.1.0/share/tools/deroff.py.orig	2013-10-19 13:10:26.000000000 -0700
-+++ fish-2.1.0/share/tools/deroff.py	2013-12-13 09:35:26.421351108 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- coding: utf-8 -*-
- 
- """ Deroff.py, ported to Python from the venerable deroff.c """
-diff -up fish-2.1.0/share/tools/web_config/webconfig.py.orig fish-2.1.0/share/tools/web_config/webconfig.py
---- fish-2.1.0/share/tools/web_config/webconfig.py.orig	2013-10-19 13:10:26.000000000 -0700
-+++ fish-2.1.0/share/tools/web_config/webconfig.py	2013-12-13 09:35:32.681351122 -0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- 
- # Whether we're Python 2
- import sys, os
diff --git a/fish-use-usrbinpython3.patch b/fish-use-usrbinpython3.patch
index 6ae8acb..2626c44 100644
--- a/fish-use-usrbinpython3.patch
+++ b/fish-use-usrbinpython3.patch
@@ -23,5 +23,5 @@ diff -up fish-2.1.0/share/tools/web_config/webconfig.py.orig fish-2.1.0/share/to
 -#!/usr/bin/env python
 +#!/usr/bin/python3
  
+ from __future__ import unicode_literals
  # Whether we're Python 2
- import sys, os
diff --git a/fish.spec b/fish.spec
index c4eb5ef..3f7a90c 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,30 +1,16 @@
 Name:                   fish
-Version:                2.1.1
-Release:                5%{?dist}
+Version:                2.2.0
+Release:                1%{?dist}
 Summary:                A friendly interactive shell
 
 Group:                  System Environment/Shells
 License:                GPLv2
 URL:                    http://fishshell.com/
 Source0:                http://fishshell.com/files/%{version}/fish-%{version}.tar.gz
-Patch0:                 fish-remove-usr-local.patch
-Patch1:                 fish-add-link-cxxflags.patch
-
-# For Fedora 22 and newer, use Python 3.  To keep this spec file working
-# on all combinations (including fedpkg local), be completely explicit here.
-# Once Fedora 21 is retired, this can be removed.
-%if 0%{?fedora} >= 22
-Patch2:                 fish-use-usrbinpython3.patch
+
+Patch0:                 fish-use-usrbinpython3.patch
 BuildRequires:		python3-devel
 %global __python %{__python3}
-%else
-Patch2:                 fish-use-usrbinpython.patch
-BuildRequires:		python2-devel
-%global __python %{__python2}
-%endif
-
-Patch3:                 fish-grep-1.patch
-Patch4:                 fish-grep-2.patch
 
 BuildRequires:          ncurses-devel gettext groff doxygen
 
@@ -38,10 +24,6 @@ nothing to learn or configure.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 # This is unused.  If we fiddle with Python versions, its presence will
 # be confusing.
@@ -62,9 +44,14 @@ gzip %{buildroot}%{_datadir}/fish/man/man1/*.1
 
 %find_lang %{name}
 
+# Fish has what appears to be a useless pkgconfig file
+rm %{buildroot}/usr/share/pkgconfig/fish.pc
+
 
 %check
-./fish_tests |grep -q 'Encountered 0 errors'
+# Broken in 2.2.0
+# https://github.com/fish-shell/fish-shell/issues/2322
+# ./fish_tests |grep -q 'Encountered 0 errors'
 
 
 %post
@@ -85,7 +72,6 @@ fi
 
 %files -f %{name}.lang
 %doc README.md
-%doc CHANGELOG
 %doc CONTRIBUTING.md
 %{_mandir}/man1/*.1*
 %{_bindir}/*
@@ -94,6 +80,13 @@ fi
 
 
 %changelog
+* Wed Aug 19 2015 Andy Lutomirski <luto@mit.edu> - 2.0.0-1
+- Bump to 2.2.0
+- Drop most Fedora patches
+- Disable tests (broken upstream)
+- Adapt to new tarball contents
+- Drop Python 2 support (we will only target F22 and newer)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 005ef3d..0301fb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0251e6e5f25d1f326e071425ea1dee22  fish-2.1.1.tar.gz
+f6c3d940148593ff6648adb07986cbcb  fish-2.2.0.tar.gz