diff --git a/SPARQLWrapper-1.7.6.tar.gz b/SPARQLWrapper-1.7.6.tar.gz
deleted file mode 100644
index ce1da65..0000000
--- a/SPARQLWrapper-1.7.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dccabec900eb9c97cb47834bd4b66ceaeb4d9ea11bae24a24fe734e9f48522f8
-size 26597
diff --git a/SPARQLWrapper-1.8.0.tar.gz b/SPARQLWrapper-1.8.0.tar.gz
new file mode 100644
index 0000000..dea332a
--- /dev/null
+++ b/SPARQLWrapper-1.8.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b46d0f18ca0b65b8b965d6d1ae257b229388400b06e7dc19f0a51614dc1abde
+size 28775
diff --git a/python-SPARQLWrapper.changes b/python-SPARQLWrapper.changes
index 0395b3a..f575c7b 100644
--- a/python-SPARQLWrapper.changes
+++ b/python-SPARQLWrapper.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon May  8 19:48:46 UTC 2017 - toddrme2178@gmail.com
+
+- Fix source URL.
+
+-------------------------------------------------------------------
+Wed May  3 17:09:10 UTC 2017 - toddrme2178@gmail.com
+
+- Update to version 1.8.0
+  * Updated return formats for not content negotiation situations
+  * Included license in the MANIFEST (issue #76)
+  * Added explicit support for RDF/XML as allowed format (issue #75)
+  * Added proper shebang (issue #78)
+  * Moved keepalive as optional dependency (issue #79)
+  * Fixed hash check on prefixes (issue #77)
+- Fixed epydoc warnings (issue #41)
+- Implement single-spec version.
+- Fix source URL.
+
 -------------------------------------------------------------------
 Mon Sep 12 12:47:10 UTC 2016 - aplanas@suse.com
 
diff --git a/python-SPARQLWrapper.spec b/python-SPARQLWrapper.spec
index bc4e14e..6ffe6eb 100644
--- a/python-SPARQLWrapper.spec
+++ b/python-SPARQLWrapper.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-SPARQLWrapper
 #
-# 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,28 +16,29 @@
 #
 
 
+%bcond_without tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-SPARQLWrapper
-Version:        1.7.6
+Version:        1.8.0
 Release:        0
 Summary:        SPARQL Endpoint interface to Python
 License:        W3C
 Group:          Development/Languages/Python
 Url:            http://sparql-wrapper.sourceforge.net/
-Source:         https://pypi.io/packages/source/S/SPARQLWrapper/SPARQLWrapper-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
+Source:         https://files.pythonhosted.org/packages/source/S/SPARQLWrapper/SPARQLWrapper-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-2to3
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+# Only used during installation
+BuildRequires:  %{python_module six}
 Requires:       python-rdflib >= 4.0
-# TODO(aplanas) python-keepalive is in the requirements.txt file, but
-# the tests pass without this package.
-# Requires:       python-keepalive >= 0.5
+Recommends:     python-rdflib >= 4.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-BuildRequires:  python-simplejson
-Requires:       python-simplejson
-%{!?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
 This is a wrapper around a SPARQL service. It helps in creating the
@@ -48,17 +49,23 @@ format.
 %setup -q -n SPARQLWrapper-%{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
+# Tests are not compatible with python3
+%if %have_python2
 python test/wrapper_test.py
+%endif
+%endif
 
-%files
+%files %{python_files}
 %defattr(-,root,root,-)
-%doc README.md AUTHORS.md
+%doc README.md AUTHORS.md LICENSE.txt 
 %{python_sitelib}/SPARQLWrapper/
 %{python_sitelib}/SPARQLWrapper-%{version}-py*.egg-info