diff --git a/humanfriendly-4.18.tar.gz b/humanfriendly-4.18.tar.gz
deleted file mode 100644
index b1e048e..0000000
--- a/humanfriendly-4.18.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33ee8ceb63f1db61cce8b5c800c531e1a61023ac5488ccde2ba574a85be00a85
-size 345853
diff --git a/humanfriendly-6.1.tar.gz b/humanfriendly-6.1.tar.gz
new file mode 100644
index 0000000..0d9e8b9
--- /dev/null
+++ b/humanfriendly-6.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b77d1aa8d73b6fe7e8860fa516fbc0e2aa85bff159d7525b0213353817cf1cfc
+size 348257
diff --git a/python-humanfriendly.changes b/python-humanfriendly.changes
index b4b5771..198e3da 100644
--- a/python-humanfriendly.changes
+++ b/python-humanfriendly.changes
@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Sat Feb 15 08:48:24 CET 2020 - Matej Cepl <mcepl@suse.com>
+
+- Update to 6.1:
+  - Added a :pypy:`…` role for easy linking to packages on the
+    Python Package Index, for details refer to
+    :func:`humanfriendly.sphinx.pypi_role()`.
+  - Wasted quite a bit of time debugging a MacOS failure on
+    Travis CI caused by a broken man`pip` installation, fixed by
+    using get-pip.py to bootstrap an installation that actually
+    works wink.
+  - Enable :class:`~humanfriendly.testing.MockedProgram` to
+    customize the shell script code of mocked programs. This was
+    added to make it easy to mock a program that is expected to
+    generate specific output (I'm planning to use this in the
+    :pypi:`linux-utils` test suite).
+  - Defined __all__ for all public modules that previously lacked
+    "export control" and decided to bump the major version number
+    as a precaution:
+    - These changes should not have any impact on backwards
+      compatibility, unless I forgot entries, in which case
+      callers can get :exc:`~exceptions.ImportError`
+      exceptions...
+    - Imports of public modules were previously exported
+      (implicitly) and this pollutes code completion suggestions
+      which in turn can encourage bad practices (not importing
+      things using their "canonical" name).
+    - I started developing the humanfriendly package years before
+      I learned about the value of defining __all__ and so some
+      modules lacked a definition until now. I decided that now
+      was as good a time as any to add those definitions
+      innocent.
+  - Simplified the headings in docs/api.rst so that only the
+    module names remain. This was done because Sphinx doesn't
+    support nested links in HTML output and thus generated really
+    weird "Table of Contents" listings.
+  - Fixed the reStructuredText references in the documentation of
+    :func:`~humanfriendly.prompts.prompt_for_choice()`. This
+    function is imported from :mod:`humanfriendly.prompts` to
+    :mod:`humanfriendly` (for backwards compatibility) where it
+    can't use relative references to refer to the other functions
+    in the :mod:`humanfriendly.prompts` module.
+  - Embedded quite a few Python API references into recent
+    changelog entries, just because I could (I heart what
+    hyperlinks can do for the usability of technical
+    documentation, it gives a lot more context).
+  - Added custom :man:`…` role for easy linking to Linux manual
+    pages to the :mod:`humanfriendly.sphinx` module.
+  - Changed rendering of pretty tables to expand tab characters
+    to spaces: Until now pretty tables did not take the variable
+    width of tab characters into account which resulted in tables
+    whose "line drawing characters" were visually misaligned.
+    Tabs are now expanded to spaces using str.expandtabs().
+  - Stop testing on Python 2.6 and drop official support. The
+    world (including Travis CI) has moved on and preserving
+    Python 2.6 compatibility was clearly starting to drag the
+    project down...
+  - I decided to bump the major version number because each of
+    these changes can be considered backwards incompatible in one
+    way or another and version numbers are cheap anyway so there
+    stuck_out_tongue.
+
 -------------------------------------------------------------------
 Wed Dec 11 08:57:19 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-humanfriendly.spec b/python-humanfriendly.spec
index b4b2a54..cf365fa 100644
--- a/python-humanfriendly.spec
+++ b/python-humanfriendly.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
 %endif
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-humanfriendly%{psuffix}
-Version:        4.18
+Version:        6.1
 Release:        0
 Summary:        Human friendly input/output for text interfaces using Python
 License:        MIT
@@ -42,6 +42,7 @@ BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module capturer >= 2.1}
 BuildRequires:  %{python_module coloredlogs >= 2}
+BuildRequires:  %{python_module docutils}
 BuildRequires:  %{python_module pytest >= 3.0.7}
 BuildRequires:  %{python_module pytest-cov >= 2.4.0}
 BuildRequires:  %{pythons}