diff --git a/python-isodate.changes b/python-isodate.changes
index 66dd357..c9cc77c 100644
--- a/python-isodate.changes
+++ b/python-isodate.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  3 17:04:31 UTC 2017 - toddrme2178@gmail.com
+
+- Implement single-spec version.
+- Fix source URL.
+
 -------------------------------------------------------------------
 Mon Jan 30 07:47:24 UTC 2017 - tbechtold@suse.com
 
diff --git a/python-isodate.spec b/python-isodate.spec
index 55f6879..7508deb 100644
--- a/python-isodate.spec
+++ b/python-isodate.spec
@@ -15,7 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# Tests don't work and cause a dependency loop with python-SPARQLWrapper
+%bcond_without tests
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-isodate
 Version:        0.5.4
 Release:        0
@@ -23,15 +26,14 @@ Url:            http://cheeseshop.python.org/pypi/isodate
 Summary:        An ISO 8601 Date/Time/Duration Parser and Formatter
 License:        BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         https://pypi.io/packages/source/i/isodate/isodate-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/i/isodate/isodate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-%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
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
 BuildArch:      noarch
-%endif
+%python_subpackages
 
 %description
 This module implements ISO 8601 date, time and duration parsing.
@@ -44,15 +46,18 @@ option.
 %setup -q -n isodate-%{version}
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with tests}
 %check
-python setup.py -q test
+%python_exec setup.py -q test
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc CHANGES.txt README.rst TODO.txt
 %{python_sitelib}/*