diff --git a/fastimport-0.9.4.tar.gz b/fastimport-0.9.4.tar.gz
deleted file mode 100644
index 1a766ff..0000000
--- a/fastimport-0.9.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad0804025ed67bde2e1250299af645197cc3a8785baf4d02cba95f2f4a391d4d
-size 24553
diff --git a/fastimport-0.9.8.tar.gz b/fastimport-0.9.8.tar.gz
new file mode 100644
index 0000000..efc3ef7
--- /dev/null
+++ b/fastimport-0.9.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2f2e8eb97000256e1aab83d2a0a053fc7b93c3aa4f7e9b971a5703dfc5963b9
+size 39512
diff --git a/python-fastimport.changes b/python-fastimport.changes
index 122706a..957ec2c 100644
--- a/python-fastimport.changes
+++ b/python-fastimport.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 23 09:48:00 UTC 2018 - tchvatal@suse.com
+
+- Switch to singlespec
+- Version update to 0.9.8:
+  * Support py3
+
 -------------------------------------------------------------------
 Tue May  5 08:59:16 UTC 2015 - benoit.monin@gmx.fr
 
diff --git a/python-fastimport.spec b/python-fastimport.spec
index 4474f1b..0c3a066 100644
--- a/python-fastimport.spec
+++ b/python-fastimport.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-fastimport
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,22 +16,20 @@
 #
 
 
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-fastimport
-Version:        0.9.4
+Version:        0.9.8
 Release:        0
 Summary:        Fastimport parser in Python
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Development/Libraries/Python
-Url:            http://launchpad.net/python-fastimport
-Source:         https://pypi.python.org/packages/source/f/fastimport/fastimport-%version.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-%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()")}
-%py_requires
-%else
+URL:            https://github.com/jelmer/python-fastimport
+Source:         https://files.pythonhosted.org/packages/source/f/fastimport/fastimport-%{version}.tar.gz
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-%endif
+%python_subpackages
 
 %description
 This is the Python parser that was originally developed for
@@ -44,14 +42,21 @@ git-remote-hg use a slightly modified version of it.
 %setup -q -n fastimport-%{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}
 
-%files
-%defattr(-,root,root)
-%python_sitelib/fastimport
-%python_sitelib/fastimport*egg-info
+%check
+%python_exec -m unittest fastimport.tests.test_suite
+
+%files %{python_files}
+%doc NEWS README.md
+%license COPYING
+%{python_sitelib}/fastimport*
+%python3_only %{_bindir}/fast-import-filter
+%python3_only %{_bindir}/fast-import-info
+%python3_only %{_bindir}/fast-import-query
 
 %changelog