diff --git a/dont-limit-versions.patch b/dont-limit-versions.patch
new file mode 100644
index 0000000..6098d9c
--- /dev/null
+++ b/dont-limit-versions.patch
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -63,7 +63,7 @@ with c_open(join(CWD, 'README.rst'), enc
+ # Manually keep these version pins in sync with those in .travis.yml and .pre-commit-config.yaml.
+ 
+ SETUP_REQS = [
+-    'setuptools_scm < 4',
++    'setuptools_scm',
+ ]
+ 
+ SPHINX_REQS = [
diff --git a/python-bidict.changes b/python-bidict.changes
index 99d146f..22eca07 100644
--- a/python-bidict.changes
+++ b/python-bidict.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 18 18:56:46 UTC 2020 - Matej Cepl <mcepl@suse.com>
+
+- Add dont-limit-versions.patch … don't limit the upper
+  version of setuptools_scm to be used.
+
 -------------------------------------------------------------------
 Fri Jan 17 16:50:46 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
 
diff --git a/python-bidict.spec b/python-bidict.spec
index f6f370d..8e70453 100644
--- a/python-bidict.spec
+++ b/python-bidict.spec
@@ -26,6 +26,9 @@ License:        MPL-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/jab/bidict
 Source:         https://files.pythonhosted.org/packages/source/b/bidict/bidict-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM dont-limit-versions.patch mcepl@suse.com
+# yet another evidence that upper limit on versions is bad idea
+Patch0:         dont-limit-versions.patch
 BuildRequires:  %{python_module setuptools_scm}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -45,7 +48,7 @@ BuildArch:      noarch
 Bidirectional map implementation and related functionality.
 
 %prep
-%setup -q -n bidict-%{version}
+%autosetup -p1 -n bidict-%{version}
 
 %build
 export LANG=en_US.UTF-8