diff --git a/.gitignore b/.gitignore
index 8b686e2..9c59a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /argcomplete-1.9.4.tar.gz
 /argcomplete-1.9.5.tar.gz
 /argcomplete-1.10.0.tar.gz
+/argcomplete-1.11.1.tar.gz
diff --git a/fish3.1.patch b/fish3.1.patch
new file mode 100644
index 0000000..0e82082
--- /dev/null
+++ b/fish3.1.patch
@@ -0,0 +1,12 @@
+diff --git a/test/test.py b/test/test.py
+index b57d5dc..febb91f 100755
+--- a/test/test.py
++++ b/test/test.py
+@@ -1251,7 +1251,6 @@ class TestFish(_TestSh, unittest.TestCase):
+     expected_failures = [
+         'test_parse_special_characters',
+         'test_comp_point',
+-        'test_special_characters_double_quoted'
+     ]
+ 
+     skipped = [
diff --git a/python-argcomplete.spec b/python-argcomplete.spec
index 7b82be1..b615d06 100644
--- a/python-argcomplete.spec
+++ b/python-argcomplete.spec
@@ -4,15 +4,21 @@
 
 Name:          python-%{modname}
 Summary:       Bash tab completion for argparse
-Version:       1.10.0
-Release:       4%{?dist}
+Version:       1.11.1
+Release:       1%{?dist}
 License:       ASL 2.0
 URL:           https://github.com/kislyuk/argcomplete
 Source0:       %pypi_source argcomplete
 
+# Fish 3.1+ compatibility, don't xfail test_special_characters_double_quoted
+# https://bugzilla.redhat.com/show_bug.cgi?id=1808322
+# https://github.com/kislyuk/argcomplete/issues/290
+Patch1:        fish3.1.patch
+
 %if %{with check}
 BuildRequires: tcsh
 BuildRequires: fish
+BuildRequires: /usr/bin/pip
 %endif
 
 BuildArch:     noarch
@@ -49,7 +55,7 @@ Requires:       python3-setuptools
 Python 3 version.
 
 %prep
-%autosetup -n %{modname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 # Remove useless BRs
 sed -i -r -e '/tests_require = /s/"(coverage|flake8|wheel)"[, ]*//g' setup.py
 # https://github.com/kislyuk/argcomplete/issues/255
@@ -63,7 +69,7 @@ sed -i -e "s|python |python3 |" test/test.py
 %install
 %py3_install
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m0644 %{buildroot}%{python3_sitelib}/%{modname}/bash_completion.d/python-argcomplete.sh %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m0644 %{buildroot}%{python3_sitelib}/%{modname}/bash_completion.d/python-argcomplete %{buildroot}%{_sysconfdir}/bash_completion.d/
 
 %if %{with check}
 %check
@@ -79,9 +85,13 @@ install -p -m0644 %{buildroot}%{python3_sitelib}/%{modname}/bash_completion.d/py
 %{_bindir}/python-argcomplete-check-easy-install-script
 %{_bindir}/python-argcomplete-tcsh
 %{_bindir}/register-python-argcomplete
-%{_sysconfdir}/bash_completion.d/python-argcomplete.sh
+%{_sysconfdir}/bash_completion.d/python-argcomplete
 
 %changelog
+* Fri Feb 28 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-1
+- Update to 1.11.1 (#1709038)
+- Fix tests with Fish 3.1 (#1808322)
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 13a7f4b..2b4f75f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (argcomplete-1.10.0.tar.gz) = 59e9cb721ddffd85d9f6461a70d50f9ba0795e36044cd46fa5fe707fb1be28c12f4ef531d2844020efc156300861b2ca8b73f56a116dd54bda0e52cf68c0a411
+SHA512 (argcomplete-1.11.1.tar.gz) = 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce