diff --git a/cmd2-0.9.16.tar.gz b/cmd2-0.9.16.tar.gz
deleted file mode 100644
index 52e3d69..0000000
--- a/cmd2-0.9.16.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b78379d53aff811d1deac720bbe71661769822a5fb2d830cd730656d180fb3d
-size 550919
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 8e9b05a..2af5357 100644
--- a/python-cmd2.changes
+++ b/python-cmd2.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Nov 14 15:18:49 CET 2019 - Matej Cepl <mcepl@suse.com>
+
+- Update to 0.9.20:
+  - the list of changes is too long, complete changelog is in
+    CHANGELOG.md included in this package.
+- Package is python3-only now.
+
+-------------------------------------------------------------------
+Wed Oct 23 07:35:49 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
+
 -------------------------------------------------------------------
 Fri Sep 13 10:57:37 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-cmd2.spec b/python-cmd2.spec
index 53db859..7a22db9 100644
--- a/python-cmd2.spec
+++ b/python-cmd2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-cmd2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,29 +17,28 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define         skip_python2 1
+%define skip_python2 1
 Name:           python-cmd2
-Version:        0.9.16
+# Do not update beyond what is supported by cliff!
+Version:        0.9.20
 Release:        0
 Summary:        Extra features for standard library's cmd module
 License:        MIT
-Group:          Development/Languages/Python
 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:  fdupes
+BuildRequires:  %{python_module wcwidth}
+BuildRequires:  python-enum34
 BuildRequires:  python-rpm-macros
-BuildRequires:  vim
-Requires:       python-attrs >= 16.3.0
-Requires:       python-colorama >= 0.3.7
-Requires:       python-pyperclip >= 1.6
-Requires:       python-wcwidth >= 0.1.7
+BuildRequires:  python-subprocess32
+BuildRequires:  python3
+Requires:       python-pyparsing >= 2.0.1
+Requires:       python-pyperclip
+Requires:       python-six
+Requires:       python-wcwidth
 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}
@@ -49,10 +48,12 @@ 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}
-BuildRequires:  %{python_module typing}
+Requires:       python-enum34
+Requires:       python-subprocess32
 %endif
 # /SECTION
 %python_subpackages
@@ -78,11 +79,12 @@ 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
 
+# Remove spurious shebang
+sed -i -e '/^#!\/usr\/bin\/env python/d' cmd2/cmd2.py
+
 %build
 %python_build
 
@@ -95,7 +97,7 @@ chmod a-x README.md
 
 %files %{python_files}
 %license LICENSE
-%doc CHANGELOG.md CODEOWNERS README.md
+%doc CHANGELOG.md README.md
 %{python3_sitelib}/*
 
 %changelog