diff --git a/python-sortedcontainers.changes b/python-sortedcontainers.changes
index e4846e2..78b5545 100644
--- a/python-sortedcontainers.changes
+++ b/python-sortedcontainers.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sat Jul 15 15:58:07 UTC 2017 - aloisio@gmx.com
+
+- Update to version 1.5.7
+  * Changed ``SortedList.__setitem__`` to support slices with stop
+    less than start and step equal one.
+  1.5.6:
+  * Changed ``SortedList.__setitem__`` to support slices that alias
+    itself.
+  1.5.5:
+  * Changed ``SortedList.extend`` to support empty iterables.
+  1.5.4:
+  * Changed ``SortedList.__new__`` to call
+    ``SortedListWithKey.__init__`` once instead of twice.
+
+- Build HTML documentation and put it into -doc subpackage
+- Enabled tests
+- Converted to singlespec
+
 -------------------------------------------------------------------
 Sun Oct  2 07:51:12 UTC 2016 - toddrme2178@gmail.com
 
diff --git a/python-sortedcontainers.spec b/python-sortedcontainers.spec
index df04ac4..d6657f5 100644
--- a/python-sortedcontainers.spec
+++ b/python-sortedcontainers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-sortedcontainers
 #
-# 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,22 +16,24 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-sortedcontainers
-Version:        1.5.3
+Version:        1.5.7
 Release:        0
 Summary:        Sorted container data types
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            http://pypi.python.org/pypi/sortedcontainers/
+Url:            http://www.grantjenks.com/docs/sortedcontainers
 Source:         https://files.pythonhosted.org/packages/source/s/sortedcontainers/sortedcontainers-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module nose}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-Sphinx
 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
-%endif
+%python_subpackages
 
 %description
 SortedContainers is an Apache2 licensed containers library, written in
@@ -48,18 +50,41 @@ deployment and use of Python easy. There's no need to install a C compiler or
 pre-build and distribute custom extensions. Performance is a feature and testing
 has 100% coverage with unit tests and hours of stress.
 
+%package     -n %{name}-doc
+Summary:        Documentation for %{name}
+Group:          Documentation/HTML
+Provides:       %{python_module zope.schema-doc = %{version}}
+Requires:       %{name} = %{version}
+
+%description -n %{name}-doc
+This package contains documentation files for %{name}.
+
 %prep
 %setup -q -n sortedcontainers-%{version}
+rm -rf sortedcontainers.egg-info
 
 %build
-python setup.py build
+%python_build
+%__python3 setup.py build_sphinx && rm build/sphinx/html/.buildinfo
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+# We need to install docs by hand to be able to run fdupes on it
+mkdir -pv %{buildroot}%{_datadir}/doc/packages/%{name}-doc
+cp -r build/sphinx/html %{buildroot}%{_datadir}/doc/packages/%{name}-doc
+%fdupes -s %{buildroot}%{_datadir}/doc/packages/%{name}-doc
+%python_expand %fdupes -s %{buildroot}%{$python_sitelib}
 
-%files
+%check
+%python_exec %{_bindir}/nosetests -v
+
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc LICENSE README.rst
 %{python_sitelib}/*
 
+%files -n %{name}-doc
+%defattr(-,root,root,-)
+%doc %{_datadir}/doc/packages/%{name}-doc
+
 %changelog
diff --git a/sortedcontainers-1.5.3.tar.gz b/sortedcontainers-1.5.3.tar.gz
deleted file mode 100644
index f30a325..0000000
--- a/sortedcontainers-1.5.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37190869bdd8405426b72b75a0e3a699b7fd6a7285905892acb49bd905d8625d
-size 29641
diff --git a/sortedcontainers-1.5.7.tar.gz b/sortedcontainers-1.5.7.tar.gz
new file mode 100644
index 0000000..96efc82
--- /dev/null
+++ b/sortedcontainers-1.5.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ff0442865e492bc50476b18000fb8400cf2472d14d21a92b27cd7c5184550ea
+size 11970881