diff --git a/python-ipython.changes b/python-ipython.changes
index 1c67661..8cf9776 100644
--- a/python-ipython.changes
+++ b/python-ipython.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec  2 21:38:05 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Prepare for upcoming python multiflavor
+  * gh#openSUSE/python-rpm-macros#66
+  * Skip python36 flavor
+  * Provide ipython3 and iptest3 for primary python3 flavor only
+    (in case that more than python38 is present, e.g. python39)
+
 -------------------------------------------------------------------
 Fri Oct 30 22:35:05 UTC 2020 - Arun Persaud <arun@gmx.de>
 
diff --git a/python-ipython.spec b/python-ipython.spec
index eb1dee2..5e8dd39 100644
--- a/python-ipython.spec
+++ b/python-ipython.spec
@@ -24,8 +24,19 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define         skip_python2 1
+
+# -- Definitions for python3 multiflavor gh#openSUSE/python-rpm-macros#66 --
+# Python 3.6 was supported with IPython up to 7.16
+%define         skip_python36 1
+# We redefine this locally, because we are sure that it is only used for files,
+# which only the primary python3 flavor should provide
+%define python3_only() %%if "%%{python_flavor}" == "python3" || "%%{python_provides}" == "python3" \
+%** \
+%%endif
+
 %bcond_without  iptest
 Name:           python-ipython%{psuffix}
 Version:        7.19.0