diff --git a/python-setuptools_scm.changes b/python-setuptools_scm.changes
index 7c58e73..6b0e627 100644
--- a/python-setuptools_scm.changes
+++ b/python-setuptools_scm.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Sat Aug 11 16:28:16 UTC 2018 - arun@gmx.de
+
+- update to version 3.1.0:
+  * fix #297 - correct the invocation in version_from_scm and
+    deprecate it as its exposed by accident
+  * fix #298 - handle git file listing on empty repositories
+  * fix #268 - deprecate ScmVersion.extra
+
+-------------------------------------------------------------------
+Wed Aug  8 15:54:22 UTC 2018 - jengelh@inai.de
+
+- Use noun phrase in summary.
+
+-------------------------------------------------------------------
+Tue Aug  7 07:19:37 UTC 2018 - tchvatal@suse.com
+
+- Fix the multibuild code
+
 -------------------------------------------------------------------
 Wed Aug  1 07:27:53 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-setuptools_scm.spec b/python-setuptools_scm.spec
index c3aaa8e..ff84283 100644
--- a/python-setuptools_scm.spec
+++ b/python-setuptools_scm.spec
@@ -24,26 +24,30 @@
 %else
 %bcond_with test
 %endif
-Name:           python-setuptools_scm
-Version:        3.0.6
+Version:        3.1.0
 Release:        0
-Summary:        Manage your versions by scm tags
+Summary:        Python setuptools handler for SCM tags
 License:        MIT
 Group:          Development/Languages/Python
 URL:            https://github.com/pypa/setuptools_scm
 Source:         https://files.pythonhosted.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-setuptools
-BuildRequires:  fdupes
 BuildArch:      noarch
 %if %{with test}
+Name:           python-setuptools_scm-%{flavor}
+%else
+Name:           python-setuptools_scm
+%endif
+%if %{with test}
 # Testing requirements
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools_scm = %{version}}
 BuildRequires:  git
 BuildRequires:  mercurial
-Requires:       this-is-only-for-build-envs
 %endif
 %if 0%{?suse_version} || 0%{?fedora_version} >= 24
 Recommends:     git
@@ -52,8 +56,8 @@ Recommends:     mecurial
 %python_subpackages
 
 %description
-The setuptools_scm package handles managing your python package versions
-in scm metadata. It also handles file finders for the supperted scm's.
+The setuptools_scm package handles managing one's Python package versions
+in SCM metadata. It also handles file finders for the supperted SCMs.
 
 %prep
 %setup -q -n setuptools_scm-%{version}
@@ -62,17 +66,21 @@ in scm metadata. It also handles file finders for the supperted scm's.
 %python_build
 
 %install
+%if !%{with test}
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
 %if %{with test}
 %check
-%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not (test_pip_download or test_old_setuptools_fails or test_old_setuptools_allows_with_warnings or test_distlib_setuptools_works)'
+%python_expand PYTHONPATH=%{$python_sitelib} py.test-%{$python_bin_suffix} -v -k 'not (test_pip_download or test_old_setuptools_fails or test_old_setuptools_allows_with_warnings or test_distlib_setuptools_works)'
 %endif
 
 %files %{python_files}
 %license LICENSE
+%if !%{with test}
 %doc README.rst CHANGELOG.rst
 %{python_sitelib}/setuptools_scm*
+%endif
 
 %changelog
diff --git a/setuptools_scm-3.0.6.tar.gz b/setuptools_scm-3.0.6.tar.gz
deleted file mode 100644
index b2bdec0..0000000
--- a/setuptools_scm-3.0.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a9cd4250443f96947c35e4790513fc008b7cc91c1475b8b523e7c7dd69766437
-size 35000
diff --git a/setuptools_scm-3.1.0.tar.gz b/setuptools_scm-3.1.0.tar.gz
new file mode 100644
index 0000000..13c5158
--- /dev/null
+++ b/setuptools_scm-3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1191f2a136b5e86f7ca8ab00a97ef7aef997131f1f6d4971be69a1ef387d8b40
+size 35585