diff --git a/.gitignore b/.gitignore
index aeb5ade..f10a300 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /admesh-0.98.1.tar.gz
 /admesh-0.98.3.tar.gz
 /admesh-0.98.5.tar.gz
+/admesh-0.98.7.tar.gz
diff --git a/python-admesh.spec b/python-admesh.spec
index 8420140..48adc26 100644
--- a/python-admesh.spec
+++ b/python-admesh.spec
@@ -1,28 +1,27 @@
 %global pypi_name admesh
-%global with_python3 1
 
 Name:           python-%{pypi_name}
-Version:        0.98.5
-Release:        5%{?dist}
+Version:        0.98.7
+Release:        1%{?dist}
 Summary:        Python bindings for ADMesh, STL manipulation library
 
 License:        GPLv2+
 URL:            https://github.com/admesh/python-admesh
-Source0:        https://pypi.python.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+Source0:        https://files.pythonhosted.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
  
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-BuildRequires:  pytest
-BuildRequires:  Cython
 BuildRequires:  admesh-devel >= 0.98
+
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+BuildRequires:  python2-pytest
+BuildRequires:  python2-Cython
+BuildRequires:  python2-pytest-runner
  
-%if %{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-pytest
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-Cython
-%endif # if with_python3
-
+BuildRequires:  python3-pytest-runner
 
 %description
 This module provides bindings for the ADMesh library.
@@ -30,76 +29,61 @@ It lets you manipulate 3D models in binary or ASCII STL
 format and partially repair them if necessary.
 
 
-%if 0%{?with_python3}
-%package -n     python3-%{pypi_name}
-Summary:        Python 3 bindings for ADMesh, STL maipulation library
+%package -n     python2-%{pypi_name}
+Summary:        Python 2 bindings for ADMesh, STL manipulation library
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
+%description -n python2-%{pypi_name}
+This module provides bindings for the ADMesh library.
+It lets you manipulate 3D models in binary or ASCII STL
+format and partially repair them if necessary.
 
 
+%package -n     python3-%{pypi_name}
+Summary:        Python 3 bindings for ADMesh, STL manipulation library
+%{?python_provide:%python_provide python3-%{pypi_name}}
+
 %description -n python3-%{pypi_name}
 This module provides bindings for the ADMesh library.
 It lets you manipulate 3D models in binary or ASCII STL
 format and partially repair them if necessary.
-%endif # with_python3
 
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
-
-
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-
-%endif # with_python3
 
 
 %build
-%{__python2} setup.py build
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
+%py2_build
+%py3_build
 
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
-popd
-%endif # with_python3
+%py2_install
+%py3_install
 
 %check
-export PYTHONPATH=`echo build/lib.linux-*/`
-py.test-%{python2_version} -v
-
-%if 0%{?with_python3}
-pushd %{py3dir}
-export PYTHONPATH=`echo build/lib.linux-*/`
-py.test-%{python3_version} -v
-popd
-%endif # with_python3
-
-%files
-%doc README.rst COPYING
+PYTHONPATH=%{buildroot}%{python2_sitearch} py.test-2 -v
+PYTHONPATH=%{buildroot}%{python3_sitearch} py.test-3 -v
+
+%files -n python2-%{pypi_name}
+%doc README.rst
+%license COPYING
 %attr(0755,root,root) %{python2_sitearch}/%{pypi_name}.so
 %{python2_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
 
-%if 0%{?with_python3}
 %files -n python3-%{pypi_name}
-%doc README.rst COPYING
+%doc README.rst
+%license COPYING
 %attr(0755,root,root) %{python3_sitearch}/%{pypi_name}.*.so
 %{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
 
 
 %changelog
+* Thu Apr 13 2017 Miro Hrončok <mhroncok@redhat.com> - 0.98.7-1
+- Updated to new version 0.98.7
+- Updated to the new naming scheme
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index cc345fe..75c4cc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7355334427fcc6fe3a428b7f7b33ad13  admesh-0.98.5.tar.gz
+SHA512 (admesh-0.98.7.tar.gz) = 34eea3528d7d48cd13fd694d9f102d1e1947af32d3bea405a464a9a3c04b54b6616f30d7ea8052d9bd403a297826da49c06b12527c78004f49d5889670393036