diff --git a/.gitignore b/.gitignore
index 9c59a25..795893b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /argcomplete-1.9.5.tar.gz
 /argcomplete-1.10.0.tar.gz
 /argcomplete-1.11.1.tar.gz
+/argcomplete-1.12.0.tar.gz
diff --git a/fish3.1.patch b/fish3.1.patch
deleted file mode 100644
index 0e82082..0000000
--- a/fish3.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 4e4cced..413fce7 100644
--- a/python-argcomplete.spec
+++ b/python-argcomplete.spec
@@ -1,63 +1,50 @@
-%global modname argcomplete
-
 %bcond_without check
 
-Name:          python-%{modname}
+Name:          python-argcomplete
 Summary:       Bash tab completion for argparse
-Version:       1.11.1
-Release:       2%{?dist}
+Version:       1.12.0
+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
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
 
 %if %{with check}
 BuildRequires: tcsh
 BuildRequires: fish
 BuildRequires: /usr/bin/pip
+BuildRequires: python3-pexpect
 %endif
 
 BuildArch:     noarch
 
-%global _description \
-Argcomplete provides easy, extensible command line tab completion of\
-arguments for your Python script.\
-\
-It makes two assumptions:\
-\
- * You are using bash as your shell\
- * You are using argparse to manage your command line arguments/options\
-\
-Argcomplete is particularly useful if your program has lots of\
-options or subparsers, and if your program can dynamically suggest\
-completions for your argument/option values (for example, if the user\
-is browsing resources over the network).
-
-%description %{_description}
-
-%package -n python3-%{modname}
-Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{modname}}
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-%if %{with check}
-BuildRequires:  python3-pexpect
-%endif
-# pkg_resources module is used from python-argcomplete-check-easy-install-script
-Requires:       python3-setuptools
+%global _description %{expand:
+Argcomplete provides easy, extensible command line tab completion of
+arguments for your Python script.
+
+It makes two assumptions:
 
-%description -n python3-%{modname} %{_description}
+ * You are using bash as your shell
+ * You are using argparse to manage your command line arguments/options
 
-Python 3 version.
+Argcomplete is particularly useful if your program has lots of
+options or subparsers, and if your program can dynamically suggest
+completions for your argument/option values (for example, if the user
+is browsing resources over the network).}
+
+%description %_description
+
+%package -n python3-argcomplete
+Summary:        %{summary}
+%description -n python3-argcomplete %_description
 
 %prep
-%autosetup -p1 -n %{modname}-%{version}
+%autosetup -p1 -n argcomplete-%{version}
 # Remove useless BRs
 sed -i -r -e '/tests_require = /s/"(coverage|flake8|wheel)"[, ]*//g' setup.py
+
 # https://github.com/kislyuk/argcomplete/issues/255
 # https://github.com/kislyuk/argcomplete/issues/256
 sed -i -e "1s|#!.*python.*|#!%{__python3}|" test/prog scripts/*
@@ -69,18 +56,18 @@ 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 %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m0644 %{buildroot}%{python3_sitelib}/argcomplete/bash_completion.d/python-argcomplete %{buildroot}%{_sysconfdir}/bash_completion.d/
 
 %if %{with check}
 %check
-%{__python3} setup.py test
+%{python3} setup.py test
 %endif
 
-%files -n python3-%{modname}
+%files -n python3-argcomplete
 %license LICENSE.rst
 %doc README.rst
-%{python3_sitelib}/%{modname}-*.egg-info/
-%{python3_sitelib}/%{modname}/
+%{python3_sitelib}/argcomplete-*.egg-info/
+%{python3_sitelib}/argcomplete/
 %{_bindir}/activate-global-python-argcomplete
 %{_bindir}/python-argcomplete-check-easy-install-script
 %{_bindir}/python-argcomplete-tcsh
@@ -88,6 +75,10 @@ install -p -m0644 %{buildroot}%{python3_sitelib}/%{modname}/bash_completion.d/py
 %{_sysconfdir}/bash_completion.d/python-argcomplete
 
 %changelog
+* Fri Jul 24 2020 Miro Hrončok <mhroncok@redhat.com> - 1.12.0-1
+- Update to 1.12.0
+- Fixes rhbz#1856103
+
 * Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.11.1-2
 - Rebuilt for Python 3.9
 
diff --git a/sources b/sources
index 2b4f75f..9cdc390 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (argcomplete-1.11.1.tar.gz) = 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
+SHA512 (argcomplete-1.12.0.tar.gz) = 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18