diff --git a/cmd2-0.8.9.tar.gz b/cmd2-0.8.9.tar.gz
deleted file mode 100644
index d1f90ab..0000000
--- a/cmd2-0.8.9.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:145cb677ebd0e3cae546ab81c30f6c25e0b08ba0f1071df854d53707ea792633
-size 112543
diff --git a/cmd2-0.9.20.tar.gz b/cmd2-0.9.20.tar.gz
new file mode 100644
index 0000000..698fd0b
--- /dev/null
+++ b/cmd2-0.9.20.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ba349af127f9052363972adcbcfb921f9ca5e90f2bcbfba11b117500f11a845
+size 560696
diff --git a/python-cmd2.changes b/python-cmd2.changes
index b9ed5f3..12497a5 100644
--- a/python-cmd2.changes
+++ b/python-cmd2.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Mon Dec  2 12:17:09 UTC 2019 - Dirk Mueller <dmueller@suse.com>
-
-- go back to 0.8.9, cliff (which is the only user) is not compatible
-  with >= 0.9.0 atm
-- Same commit like October 23th
-
 -------------------------------------------------------------------
 Fri Nov 22 10:46:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-cmd2.spec b/python-cmd2.spec
index ca14f95..8913cd5 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -17,25 +17,30 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define         skip_python2 1
 Name:           python-cmd2
-# Do not update beyond what is supported by cliff!
-Version:        0.8.9
+Version:        0.9.20
 Release:        0
 Summary:        Extra features for standard library's cmd module
 License:        MIT
 URL:            https://github.com/python-cmd2/cmd2
 Source:         https://files.pythonhosted.org/packages/source/c/cmd2/cmd2-%{version}.tar.gz
-BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wcwidth}
-BuildRequires:  python-enum34
+BuildRequires:  %{pythons}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-BuildRequires:  python-subprocess32
-Requires:       python-pyparsing >= 2.0.1
-Requires:       python-pyperclip
-Requires:       python-six
-Requires:       python-wcwidth
+BuildRequires:  vim
+Requires:       python
+Requires:       python-attrs >= 16.3.0
+Requires:       python-colorama >= 0.3.7
+Requires:       python-pyperclip >= 1.6
+Requires:       python-wcwidth >= 0.1.7
 BuildArch:      noarch
+%if %{python3_version_nodots} < 35
+Requires:       python-contextlib2
+Requires:       python-typing
+%endif
 # SECTION Test requirements
 BuildRequires:  %{python_module attrs >= 16.3.0}
 BuildRequires:  %{python_module colorama >= 0.3.7}
@@ -45,12 +50,10 @@ BuildRequires:  %{python_module pytest-mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module wcwidth >= 0.1.7}
 # Required by tests.
-BuildRequires:  fdupes
 BuildRequires:  vim
 %if 0%{?suse_version} <= 1315
 BuildRequires:  %{python_module contextlib2}
-Requires:       python-enum34
-Requires:       python-subprocess32
+BuildRequires:  %{python_module typing}
 %endif
 # /SECTION
 %python_subpackages
@@ -76,6 +79,8 @@ Drop-in replacement adds several features for command-prompt tools:
 
 %prep
 %setup -q -n cmd2-%{version}
+# Fix non-executable-script
+sed -i -e '/^#!\//, 1d' cmd2/cmd2.py
 # Fix spurious-executable-perm
 chmod a-x README.md
 
@@ -91,7 +96,7 @@ chmod a-x README.md
 
 %files %{python_files}
 %license LICENSE
-%doc CHANGELOG.md README.md
+%doc CHANGELOG.md CODEOWNERS README.md
 %{python3_sitelib}/*
 
 %changelog