diff --git a/invoke-0.21.0.tar.gz b/invoke-0.21.0.tar.gz
new file mode 100644
index 0000000..99ee038
--- /dev/null
+++ b/invoke-0.21.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab3b4cad44df0fda3918fd4c8dbfd3eaac52df5b95cedd5381856d132fbb676c
+size 290864
diff --git a/invoke-0.9.0.tar.gz b/invoke-0.9.0.tar.gz
deleted file mode 100644
index 2ded20c..0000000
--- a/invoke-0.9.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f97c3b9e6d8f12327f5f0f39af0544b6b68863a182484b16666243667d767a2b
-size 87295
diff --git a/python-invoke.changes b/python-invoke.changes
index dbcc62c..23ce455 100644
--- a/python-invoke.changes
+++ b/python-invoke.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 18 15:59:42 UTC 2017 - toddrme2178@gmail.com
+
+- Update to 0.21.0
+  * No changelog
+
+-------------------------------------------------------------------
+Thu Aug 24 13:41:17 UTC 2017 - jmatejek@suse.com
+
+- singlespec auto-conversion
+
 -------------------------------------------------------------------
 Sat Dec 10 16:48:21 UTC 2016 - jengelh@inai.de
 
@@ -115,3 +126,4 @@ Sun Jan 12 12:54:12 UTC 2014 - toms@opensuse.org
 
 - Initial version 0.6.1
 
+
diff --git a/python-invoke.spec b/python-invoke.spec
index c5217eb..5c78333 100644
--- a/python-invoke.spec
+++ b/python-invoke.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-invoke
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,33 +16,39 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+# Tests have a dependency loop with python(2|3)-invocations
+%bcond_with     test
 Name:           python-invoke
-Version:        0.9.0
+Version:        0.21.0
 Release:        0
 Summary:        Pythonic Task Execution
 License:        BSD-2-Clause
 Group:          Development/Languages/Python
 Url:            http://docs.pyinvoke.org
-Source:         https://pypi.python.org/packages/source/i/invoke/invoke-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
+Source:         https://files.pythonhosted.org/packages/source/i/invoke/invoke-%{version}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module invocations}
+BuildRequires:  %{python_module nose}
+BuildRequires:  python-mock
 %endif
+BuildArch:      noarch
+Requires(post):   update-alternatives
+Requires(postun):  update-alternatives
+%python_subpackages
 
 %description
-Invoke is a Python (2.6+ and 3.2+) task execution tool & library, drawing 
+Invoke is a Python (2.6+ and 3.2+) task execution tool & library, drawing
 inspiration from various sources to arrive at a powerful & clean feature set.
 
 * Like Ruby's Rake tool and Invoke's own predecessor Fabric 1.x, it provides a
   clean, high level API for running shell commands and defining/organizing
   task functions from a ``tasks.py`` file
-  
+
 * From GNU Make, it inherits an emphasis on minimal boilerplate for common
   patterns and the ability to run multiple tasks in a single invocation::
 
@@ -59,45 +65,38 @@ inspiration from various sources to arrive at a powerful & clean feature set.
 * Like many of its predecessors, it offers advanced features as well --
   namespacing, task aliasing, before/after hooks, parallel execution and more.
 
-
-
 %prep
 %setup -q -n invoke-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-mv %{buildroot}%{_bindir}/inv %{buildroot}%{_bindir}/inv-%{py_ver}
-mv %{buildroot}%{_bindir}/invoke %{buildroot}%{_bindir}/invoke-%{py_ver}
-ln -s  %{_bindir}/inv-%{py_ver} %{buildroot}%{_bindir}/inv
-ln -s  %{_bindir}/invoke-%{py_ver} %{buildroot}%{_bindir}/invoke
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%pre -p /bin/bash
-# Since /usr/bin/* became ghosted to be used with update-alternatives, we have to get rid
-# of the old binary resulting from the non-update-alternativies-ified package:
-[[ ! -L %{_bindir}/inv ]] && rm -f %{_bindir}/inv
-[[ ! -L %{_bindir}/invoke ]] && rm -f %{_bindir}/invoke
-exit 0
+%python_clone -a %{buildroot}%{_bindir}/inv
+%python_clone -a %{buildroot}%{_bindir}/invoke
+
+%if %{with test}
+%check
+%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib}
+%{buildroot}%{_bindir}/inv-%{$python_bin_suffix} -l 
+}
+%endif
 
 %post
-update-alternatives \
-   --install %{_bindir}/invoke invoke %{_bindir}/invoke-%{py_ver} 30 \
-   --slave %{_bindir}/inv inv %{_bindir}/inv%{py_ver} \
+%{python_install_alternative inv invoke}
 
-%preun
-if [ $1 -eq 0 ] ; then
-    update-alternatives --remove invoke %{_bindir}/invoke-%{py_ver}
-fi
+%postun
+%python_uninstall_alternative inv
 
-%files
-%defattr(-,root,root,-)
+%files %{python_files}
+%defattr(-,root,root)
 %doc LICENSE README.rst
-%{_bindir}/inv-%{py_ver}
-%{_bindir}/invoke-%{py_ver}
-%ghost %{_bindir}/inv
-%ghost %{_bindir}/invoke
-%{python_sitelib}/*
+%python_alternative %{_bindir}/inv
+%python_alternative %{_bindir}/invoke
+%{python_sitelib}/invoke/
+%{python_sitelib}/invoke-%{version}-py*
+
 
-%changelog