diff --git a/python-osc-tiny.changes b/python-osc-tiny.changes
index 2fce88f..3103743 100644
--- a/python-osc-tiny.changes
+++ b/python-osc-tiny.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Aug  3 09:48:04 UTC 2022 - Marina Latini <marina.latini@suse.com>
+
+- Buildrequires cached-property always, not only for Python lower than 3.8
+  * This is needed due to a mismatching python-rpm-macros
+
+-------------------------------------------------------------------
+Wed Aug  3 08:01:55 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Fix conditional Requires and BuildRequires.
+
 -------------------------------------------------------------------
 Tue Aug  2 15:45:47 UTC 2022 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-osc-tiny.spec b/python-osc-tiny.spec
index e0d0a53..5d4903a 100644
--- a/python-osc-tiny.spec
+++ b/python-osc-tiny.spec
@@ -41,12 +41,16 @@ Requires:       python-lxml
 Requires:       python-python-dateutil
 Requires:       python-pytz
 Requires:       python-requests
+Requires:       python-responses
 Suggests:       openssh
 BuildArch:      noarch
-%if %python_version_nodots < 38
+# Using 'if' instead of 'with' because the latter requires rpm >= 4.14
+%if 0%{?suse_version} >= 1550
+BuildRequires:  %{python_module cached-property if %python-base < 3.8}
+%else
 BuildRequires:  %{python_module cached-property}
-Requires:       python-cached-property
 %endif
+Requires:       (python-cached-property if python-base < 3.8)
 %python_subpackages
 
 %description