diff --git a/python-memcached-1.57.tar.gz b/python-memcached-1.57.tar.gz
deleted file mode 100644
index b9b16f9..0000000
--- a/python-memcached-1.57.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b689a135afb2fdb6da2298d5213780f43a3f210cf8c960d50b252acb3f62902
-size 22620
diff --git a/python-memcached-1.58.tar.gz b/python-memcached-1.58.tar.gz
new file mode 100644
index 0000000..e62502d
--- /dev/null
+++ b/python-memcached-1.58.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2775829cb54b9e4c5b3bbd8028680f0c0ab695db154b9c46f0f074ff97540eb6
+size 30562
diff --git a/python-python-memcached.changes b/python-python-memcached.changes
index eaa705b..8d67940 100644
--- a/python-python-memcached.changes
+++ b/python-python-memcached.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Aug 24 13:52:44 UTC 2017 - jmatejek@suse.com
+
+- singlespec auto-conversion
+
+-------------------------------------------------------------------
+Tue Nov 15 13:13:46 UTC 2016 - dmueller@suse.com
+
+- update to 1.58:
+  *  Fixing a performance regression in v1.54 in Python 2, using cPickle again.
+  *  Support for "stats slabs".
+  *  Pin Six version to >= 1.4
+  *  setup.py build process pulls version from memcached.py
+  *  delete() and delete_multi() now default the "time" argument to None,
+     since the protocol doesn't allow a time in some implementations.
+     Patch by oremj #27
+
 -------------------------------------------------------------------
 Tue Oct  6 11:21:23 UTC 2015 - mcihar@suse.cz
 
@@ -129,3 +146,4 @@ Fri Nov 26 23.00.00 UTC 2010 - stian@viskjer.net
 
 - python-memcached 1.45
   * Initial specfile based on Fedora's v1.43-6
+
diff --git a/python-python-memcached.spec b/python-python-memcached.spec
index 9221e8f..f6ee1b1 100644
--- a/python-python-memcached.spec
+++ b/python-python-memcached.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-python-memcached
 #
-# Copyright (c) 2015 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,28 +16,33 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define oldpython python
+%bcond_with     test
 Name:           python-python-memcached
-Version:        1.57
+Version:        1.58
 Release:        0
-Url:            http://www.tummy.com/Community/software/python-memcached/
 Summary:        Pure python memcached client
 License:        Python-2.0
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/p/python-memcached/python-memcached-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-nose
-BuildRequires:  python-setuptools
-BuildRequires:  python-six
-Requires:       python-six
-
-%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
+Url:            http://www.tummy.com/Community/software/python-memcached/
+Source:         https://files.pythonhosted.org/packages/source/p/python-memcached/python-memcached-%{version}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
+BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module nose}
+BuildRequires:  memcached
 %endif
-Provides:       python-memcached = %{version}
-Obsoletes:      python-memcached < %{version}
+Requires:       memcached
+Requires:       python-six
+BuildArch:      noarch
+%ifpython2
+Provides:       %{oldpython}-memcached = %{version}
+Obsoletes:      %{oldpython}-memcached < %{version}
+%endif
+%python_subpackages
 
 %description
 This package was originally written by Evan Martin of Danga.
@@ -52,17 +57,19 @@ for more information.
 %setup -q -n python-memcached-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
 
+%if %{with test}
 %check
-nosetests
+%python_expand nosetests-%{$python_bin_suffix}
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
-%doc README.md
+%doc README.md PSF.LICENSE
 %{python_sitelib}/*
 
 %changelog