diff --git a/python-six.changes b/python-six.changes
index e282eee..9648159 100644
--- a/python-six.changes
+++ b/python-six.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Oct 16 16:49:50 UTC 2017 - jmatejek@suse.com
+
+- remove egg-info directory before installation if it exists,
+  because setuptools produce directory and six switched to distutils
+  that produce a file
+  (and because rpm can't handle that by itself)
+
 -------------------------------------------------------------------
 Thu Sep 28 07:47:18 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-six.spec b/python-six.spec
index 2119b50..bfaf93e 100644
--- a/python-six.spec
+++ b/python-six.spec
@@ -59,6 +59,12 @@ what is provided.
 # %check
 # python test_six.py
 
+%pre
+# bsc#1057496 - egg-info changed from directory to file
+if [ -d %{python_sitelib}/six-%{version}-py%{python_version}.egg-info ]; then
+    rm -r %{python_sitelib}/six-%{version}-%{python_version}.egg-info
+fi
+
 %files %python_files
 %defattr(-,root,root)
 %doc LICENSE README.rst CHANGES