diff --git a/html2text-2016.9.19.tar.gz b/html2text-2016.9.19.tar.gz
deleted file mode 100644
index 42f66c7..0000000
--- a/html2text-2016.9.19.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55
-size 47899
diff --git a/html2text-2018.1.9.tar.gz b/html2text-2018.1.9.tar.gz
new file mode 100644
index 0000000..86a9599
--- /dev/null
+++ b/html2text-2018.1.9.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:627514fb30e7566b37be6900df26c2c78a030cc9e6211bda604d8181233bcdd4
+size 52211
diff --git a/python-html2text.changes b/python-html2text.changes
index 917b3ab..e58cec5 100644
--- a/python-html2text.changes
+++ b/python-html2text.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Thu Aug 16 10:23:31 UTC 2018 - jengelh@inai.de
+
+- Use noun phrase for summary. Ensure accuracy and
+  neutrality of description.
+
+-------------------------------------------------------------------
+Mon Aug 13 11:39:14 UTC 2018 - mcepl@suse.com
+
+- Upgrade to 2018.1.9:
+    Fix #188: Non-ASCII in title attribute causes encode error.
+    Feature #194: Add support for the <kbd> tag.
+    Feature #193: Add support for the <q> tag.
+    Fix #157: Fix images link with div wrap
+    Fix #55: Fix error when empty title tags
+    Fix #160: The html2text tests are failing on Windows and on
+        Cygwin due to differences in eol handling between
+        Windows/*nix
+    Feature #164: Housekeeping: Add flake8 to the travis build,
+        cleanup existing flake8 violations, add py3.6 and pypy3
+        to the travis build
+    Fix #109: Fix for unexpanded &lt; &gt; &amp;
+    Fix #143: Fix line wrapping for the lines starting with bold
+        Adds support for numeric bold text indication in font-weight,
+        as used by Google (and presumably others.)
+    Fix #173 and #142: Stripping whitespace in crucial markdown
+        and adding whitespace as necessary
+        Don't drop any cell data on tables uneven row lengths
+        (e.g. colspan in use)
+
+-------------------------------------------------------------------
+Mon Aug 13 08:38:04 UTC 2018 - mcepl@suse.com
+
+- Remove dependency on unittetst2
+  Added remove_unittest2.patch to facilitate that
+
 -------------------------------------------------------------------
 Thu Apr 27 16:33:29 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-html2text.spec b/python-html2text.spec
index 748456e..cc145d4 100644
--- a/python-html2text.spec
+++ b/python-html2text.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-html2text
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,39 +16,38 @@
 #
 
 
-%bcond_without tests
+#
+%define upname html2text
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-html2text
-Version:        2016.9.19
+%bcond_without tests
+Name:           python-%{upname}
+Version:        2018.1.9
 Release:        0
-Url:            https://github.com/Alir3z4/html2text/
-Summary:        Turn HTML into equivalent Markdown-structured text
-License:        GPL-3.0
+Summary:        Python script for turning HTML into Markdown text
+License:        GPL-3.0-only
 Group:          Development/Languages/Python
-Source:         https://files.pythonhosted.org/packages/source/h/html2text/html2text-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
+URL:            https://github.com/Alir3z4/html2text/
+Source:         https://files.pythonhosted.org/packages/source/h/%{upname}/%{upname}-%{version}.tar.gz
+Patch0:         remove_unittest2.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
-%if %{with tests}
-BuildRequires:  python2-unittest2
-%endif
-Requires(post):   update-alternatives
-Requires(preun):  update-alternatives
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 BuildArch:      noarch
 %python_subpackages
 
 %description
-html2text is a Python script that converts a page of HTML into clean,
-easy-to-read plain ASCII text. Better yet, that ASCII also happens to
-be valid Markdown (a text-to-HTML format).
+html2text is a Python script that converts a page of HTML into
+Markdown (a text-to-HTML format).
 
 %prep
-%setup -q -n html2text-%{version}
+%setup -q -n %{upname}-%{version}
+%patch0 -p1
 # remove useless shebang
-sed -i '/^#!/d' html2text/__init__.py
+sed -i '/^#!/d' %{upname}/__init__.py
 
 %build
 %python_build
@@ -57,29 +56,26 @@ sed -i '/^#!/d' html2text/__init__.py
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-# To avoid conflicts with the rst2html5 package
-mv %{buildroot}%{_bindir}/html2text %{buildroot}%{_bindir}/html2text-python
-ln -s -f %{_sysconfdir}/alternatives/html2text %{buildroot}%{_bindir}/html2text
+%python_clone -a %{buildroot}%{_bindir}/%{upname}
+
+# remove executable bits from egg files
+%python_expand chmod -x %{buildroot}%{$python_sitelib}/%{upname}-*.egg-info/*
 
 %post
-update-alternatives --install %{_bindir}/html2text html2text %{_bindir}/html2text-python 15
+%python_install_alternative html2text
 
-%preun
-if [ ! -f %{_bindir}/html2text-python ] ; then
-   update-alternatives --remove html2text %{_bindir}/html2text-python
-fi
+%postun
+%python_uninstall_alternative html2text
 
 %if %{with tests}
 %check
 %python_exec setup.py test
 %endif
 
-%files %python_files
-%defattr(-,root,root,-)
-%doc COPYING README.md AUTHORS.rst ChangeLog.rst
-%python3_only %{_bindir}/html2text
-%python3_only %{_bindir}/html2text-python
-%python3_only %ghost %{_sysconfdir}/alternatives/html2text
+%files %{python_files}
+%license COPYING
+%doc README.md AUTHORS.rst ChangeLog.rst
+%python_alternative %{_bindir}/%{upname}
 %{python_sitelib}/*
 
 %changelog
diff --git a/remove_unittest2.patch b/remove_unittest2.patch
new file mode 100644
index 0000000..d65c7f6
--- /dev/null
+++ b/remove_unittest2.patch
@@ -0,0 +1,64 @@
+--- a/setup.py
++++ b/setup.py
+@@ -18,14 +18,7 @@ try:
+ except ImportError:
+     read_md = read_md_open
+ 
+-requires_list = []
+-try:
+-    import unittest2 as unittest
+-except ImportError:
+-    import unittest
+-else:
+-    if sys.version_info <= (2, 6):
+-        requires_list.append("unittest2")
++import unittest
+ 
+ 
+ class RunTests(Command):
+@@ -68,9 +61,6 @@ setup(
+         'Operating System :: OS Independent',
+         'Programming Language :: Python',
+         'Programming Language :: Python :: 2',
+-        'Programming Language :: Python :: 2.4',
+-        'Programming Language :: Python :: 2.5',
+-        'Programming Language :: Python :: 2.6',
+         'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+         'Programming Language :: Python :: 3.0',
+@@ -85,7 +75,6 @@ setup(
+         html2text=html2text.cli:main
+     """,
+     license='GNU GPL 3',
+-    requires=requires_list,
+     packages=find_packages(exclude=['test']),
+     include_package_data=True,
+     zip_safe=False,
+--- a/test/test_html2text.py
++++ b/test/test_html2text.py
+@@ -7,10 +7,7 @@ import re
+ import subprocess
+ import sys
+ 
+-if sys.version_info[:2] < (2, 7):
+-    import unittest2 as unittest
+-else:
+-    import unittest
++import unittest
+ 
+ 
+ logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',
+--- a/test/test_memleak.py
++++ b/test/test_memleak.py
+@@ -1,10 +1,7 @@
+ import html2text
+ import logging
+ import sys
+-if sys.version_info[:2] < (2, 7):
+-    import unittest2 as unittest
+-else:
+-    import unittest
++import unittest
+ 
+ 
+ logging.basicConfig(format='%(levelname)s:%(funcName)s:%(message)s',