diff --git a/python-Genshi.changes b/python-Genshi.changes
index 06fad44..5904b01 100644
--- a/python-Genshi.changes
+++ b/python-Genshi.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Apr  6 15:53:52 UTC 2017 - toddrme2178@gmail.com
+
+- Update singlespec build
+- Use pypi download url
+
+-------------------------------------------------------------------
+Mon Dec 19 17:34:46 UTC 2016 - jmatejek@suse.com
+
+- update for multipython build
+
 -------------------------------------------------------------------
 Fri Jul 24 20:36:31 UTC 2015 - seife+obs@b1-systems.com
 
diff --git a/python-Genshi.spec b/python-Genshi.spec
index 106598e..19ef4d0 100644
--- a/python-Genshi.spec
+++ b/python-Genshi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Genshi
 #
-# 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,6 +16,7 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-Genshi
 Version:        0.7
 Release:        0
@@ -23,22 +24,25 @@ Url:            http://genshi.edgewall.org/
 Summary:        A toolkit for generation of output for the web
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         http://ftp.edgewall.com/pub/genshi/Genshi-%{version}.tar.gz
-# FIX-UPSTREAM http://genshi.edgewall.org/ticket/566
+Source:         https://files.pythonhosted.org/packages/source/G/Genshi/Genshi-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM http://genshi.edgewall.org/ticket/566
 Patch1:         changeset_r1242.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-Babel
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-BuildRequires:  python-xml
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module Babel}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module xml}
 Requires:       python-Babel
 Requires:       python-xml
-Provides:       python-genshi = %{version}
-Obsoletes:      python-genshi < %{version}
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)")}
-%{py_requires}
+%define oldpython python
+%ifpython2
+Obsoletes:      %{oldpython}-genshi < %{version}
+Provides:       %{oldpython}-genshi = %{version}
 %endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%python_subpackages
 
 %description
 Genshi is a Python library that provides an integrated set of
@@ -47,7 +51,6 @@ other textual content for output generation on the web. The major
 feature is a template language, which is heavily inspired by Kid.
 
 %package doc
-
 Summary:        A toolkit for generation of output for the web - Documentation
 Group:          Development/Libraries/Python
 Requires:       %{name} = %{version}
@@ -66,19 +69,22 @@ This package contains documentation and examples.
 sed -i "1d" examples/{basic/run,basic/kidrun,tutorial/geddit/controller}.py # Fix non-excutable bits
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
 
-%files
+%{python_expand %fdupes %{buildroot}%{$python_sitearch} }
+
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog README.txt
 %{python_sitearch}/genshi/
 %{python_sitearch}/Genshi-%{version}-py*.egg-info
 
-%files doc
+%files %{python_files doc}
 %defattr(-,root,root,-)
-%doc doc examples
+%doc doc/
+%doc examples/
 
 %changelog