diff --git a/importlib_metadata-2.0.0.tar.gz b/importlib_metadata-2.0.0.tar.gz
deleted file mode 100644
index eb7caba..0000000
--- a/importlib_metadata-2.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77a540690e24b0305878c37ffd421785a6f7e53c8b5720d211b211de8d0e95da
-size 29289
diff --git a/importlib_metadata-3.1.1.tar.gz b/importlib_metadata-3.1.1.tar.gz
new file mode 100644
index 0000000..88f644c
--- /dev/null
+++ b/importlib_metadata-3.1.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0c2d3b226157ae4517d9625decf63591461c66b3a808c2666d538946519d170
+size 32217
diff --git a/python-importlib-metadata.changes b/python-importlib-metadata.changes
index 7af8bf3..c497e23 100644
--- a/python-importlib-metadata.changes
+++ b/python-importlib-metadata.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Dec  7 17:50:51 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Update to 3.1.1
+  * no changelog, probably just the merge of 2.1.1
+- Update in v2.1.1
+  * #261: Restored compatibility for package discovery for metadata
+    without version in the name and for legacy eggs.
+- Update in v3.1.0
+  * Merge with 2.1.0.
+- Update in v2.1.0
+  * #253: When querying for package metadata, the lookup now honors
+    package normalization rules.
+- Update in v3.0.0
+  * Require Python 3.6 or later.
+- Upstream switched to pytest, so do we
+- Revert last change: The condition for **BuildRequires** does not
+  make any sense, as that would also prevent the install of 
+  python36-importlib_resources into the build environment.
+
 -------------------------------------------------------------------
 Wed Dec  2 18:11:11 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-importlib-metadata.spec b/python-importlib-metadata.spec
index b230a2f..d09c956 100644
--- a/python-importlib-metadata.spec
+++ b/python-importlib-metadata.spec
@@ -25,41 +25,33 @@
 %bcond_with test
 %endif
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define skip_python2 1
 Name:           python-importlib-metadata%{psuffix}
-Version:        2.0.0
+Version:        3.1.1
 Release:        0
 Summary:        Read metadata from Python packages
 License:        Apache-2.0
 URL:            http://importlib-metadata.readthedocs.io/
 Source:         https://files.pythonhosted.org/packages/source/i/importlib_metadata/importlib_metadata-%{version}.tar.gz
+BuildRequires:  %{python_module base >= 3.6}
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module toml}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-zipp >= 0.5
 Provides:       python-importlib_metadata = %{version}
 BuildArch:      noarch
 %if %{with test}
-%if %{python_version_nodots} < 39
 BuildRequires:  %{python_module importlib_resources >= 1.3}
-%endif
 BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pep517}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pyfakefs}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module testsuite}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  %{python_module zipp >= 0.5}
-%if %{?suse_version} <= 1500
-BuildRequires:  python2-configparser >= 3.5
-BuildRequires:  python2-contextlib2
-BuildRequires:  python2-pathlib2
-%endif
-%endif
-%ifpython2
-Requires:       python-configparser >= 3.5
-Requires:       python-contextlib2
-Requires:       python-pathlib2
 %endif
 %python_subpackages
 
@@ -81,7 +73,8 @@ documentation.
 
 %prep
 %setup -q -n importlib_metadata-%{version}
-rm -r importlib_metadata/docs
+# don't import from sourcedir during testing
+sed -i -e 's/norecursedirs.*/& importlib_metadata/' pytest.ini
 
 %build
 %python_build
@@ -94,7 +87,7 @@ rm -r importlib_metadata/docs
 
 %check
 %if %{with test}
-%pyunittest -v
+%pytest
 %endif
 
 %if !%{with test}