diff --git a/.gitignore b/.gitignore
index b8e0e7d..1aca833 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /python-productmd-1.4.tar.gz
 /python-productmd-1.6.tar.gz
 /python-productmd-1.7.tar.gz
+/python-productmd-1.8.tar.gz
diff --git a/python-productmd.spec b/python-productmd.spec
index 060dc43..d9a433a 100644
--- a/python-productmd.spec
+++ b/python-productmd.spec
@@ -26,7 +26,7 @@
 %{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
 
 Name:           python-productmd
-Version:        1.7
+Version:        1.8
 Release:        1%{?dist}
 Summary:        Library providing parsers for metadata related to OS installation
 
@@ -35,12 +35,6 @@ License:        LGPLv2+
 URL:            https://github.com/release-engineering/productmd
 Source0:        https://files.pythonhosted.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
-Obsoletes:      productmd <= %{version}-%{release}
-Provides:       productmd = %{version}-%{release}
-Provides:       python2-productmd = %{version}-%{release}
-
-Requires:       python-six
-
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-six
@@ -53,10 +47,21 @@ BuildRequires:  python%{python3_pkgversion}-six
 
 BuildArch:      noarch
 
-%description
-Python library providing parsers for metadata related to composes
+%global _description\
+Python library providing parsers for metadata related to composes\
 and installation media.
 
+%description %_description
+
+%package -n python2-productmd
+Summary: %summary
+Obsoletes:      productmd <= %{version}-%{release}
+Provides:       productmd = %{version}-%{release}
+Requires:       python-six
+%{?python_provide:%python_provide python2-productmd}
+
+%description -n python2-productmd %_description
+
 %if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-productmd
 Summary:       Library providing parsers for metadata related to OS installation
@@ -96,7 +101,7 @@ and installation media.
 # Implemented in EPEL, but not in RHEL
 %{!?_licensedir:%global license %doc}
 
-%files
+%files -n python2-productmd
 %license LICENSE
 %doc AUTHORS
 %{python_sitelib}/productmd/
@@ -111,6 +116,18 @@ and installation media.
 %endif
 
 %changelog
+* Wed Oct 11 2017 Lubomír Sedlář <lsedlar@redhat.com> 1.8-1
+- Report better error on parsing invalid JSON (#95) (lubomir.sedlar@gmail.com)
+- Python 2 binary package renamed to python2-productmd (zbyszek@in.waw.pl)
+- Sync spec file with Fedora (#94) (lubomir.sedlar@gmail.com)
+
+* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.7-3
+- Python 2 binary package renamed to python2-productmd
+  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Wed Apr 19 2017 Lubomír Sedlář <lsedlar@redhat.com> 1.7-1
 - common: omit context kwarg to urlopen on old Python (lsedlar@redhat.com)
 
diff --git a/sources b/sources
index fe9c2df..8106d4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-productmd-1.7.tar.gz) = 90ec0de1ff01c09d9496c849f7f603383bcf9d226d869602e7a379ad9fac54317316e4ad28cc8f6ae424bf74c9d1a61b4592a49961ae7fb26a954d67888b6dc2
+SHA512 (python-productmd-1.8.tar.gz) = 0a9c38a2412d0d02463f5b97c60504de5802e7ae6c186f785a943ea0b491ce3f1efd392213ae1e7d7c0fc0e6734bc65e0e47ca7c8539f2201b3aabbf8e6570d5