diff --git a/macros.python b/macros.python
index 8b168b5..37961b0 100644
--- a/macros.python
+++ b/macros.python
@@ -51,8 +51,29 @@
     print(string.sub(package,9,string.len(package)))
     print(" < ")
     print(vr)
-  elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then
-    --No unversioned provides as python3 is not default
+  elseif (string.starts(package, "python3-")) then
+    if (rpm.expand("%{?buildarch}") ~= "noarch") then
+      str = "Provides: python36-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr
+      print(rpm.expand(str))
+    end
+    print("\\nProvides: python36-")
+    print(string.sub(package,9,string.len(package)))
+    print(" = ")
+    print(vr)
+    --Obsoleting the EPEL python36 package
+    print("\\nObsoletes: python36-")
+    print(string.sub(package,9,string.len(package)))
+    print(" < ")
+    print(vr)
+  elseif (string.starts(package, "python36-")) then
+    if (rpm.expand("%{?buildarch}") ~= "noarch") then
+      str = "Provides: python3-" .. string.sub(package,10,string.len(package)) .. "%{?_isa} = " .. vr
+      print(rpm.expand(str))
+    end
+    print("\\nProvides: python3-")
+    print(string.sub(package,10,string.len(package)))
+    print(" = ")
+    print(vr)
   elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then
     --No unversioned provides as python3_other is not default
   elseif (string.starts(package, "pypy-")) then
diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec
index fc73d05..979e1eb 100644
--- a/python-rpm-macros.spec
+++ b/python-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           python-rpm-macros
 Version:        3
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -67,6 +67,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
 
 
 %changelog
+* Thu Apr 25 2019 Miro Hrončok <mhroncok@redhat.com> - 3-24
+- %%python_provide: Obsolete and provide python36- from python3-
+- %%python_provide: Provide python3- from python36-
+
 * Thu Jan 31 2019 Miro Hrončok <mhroncok@redhat.com> - 3-23
 - Make Python 3.6 the main Python 3 version
 - Make Python 3.4 the other Python 3 version