diff --git a/SOURCES/macros.python b/SOURCES/macros.python
index 37961b0..7d019c4 100644
--- a/SOURCES/macros.python
+++ b/SOURCES/macros.python
@@ -4,7 +4,7 @@
 # Use the slashes after expand so that the command starts on the same line as
 # the macro
 %py_build() %{expand:\\\
-  CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python2} %{py_shbang_opts}" %{?*}
+  CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} build --executable="%{__python} %{py_shbang_opts}" %{?*}
   sleep 1
 }
 
diff --git a/SOURCES/macros.python-srpm b/SOURCES/macros.python-srpm
index c4bdd1c..0c431e4 100644
--- a/SOURCES/macros.python-srpm
+++ b/SOURCES/macros.python-srpm
@@ -57,7 +57,8 @@
         end\
         for arg, name in ipairs(args) do\
                 canonical = rpm.expand("%py_dist_name " .. name);\
-                print("python3dist(" .. canonical .. ") ");\
+                python3_version = rpm.expand("%python3_version");\
+                print("python" .. python3_version .. "dist(" .. canonical .. ") ");\
         end\
 }
 
diff --git a/SPECS/python-rpm-macros.spec b/SPECS/python-rpm-macros.spec
index 18bfdc6..a2bc64d 100644
--- a/SPECS/python-rpm-macros.spec
+++ b/SPECS/python-rpm-macros.spec
@@ -2,7 +2,7 @@
 
 Name:           python-rpm-macros
 Version:        3
-Release:        32%{?dist}
+Release:        34%{?dist}
 Summary:        The unversioned Python RPM macros
 
 License:        MIT
@@ -74,6 +74,14 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
 
 
 %changelog
+* Tue Mar 17 2020 Miro Hrončok <mhroncok@redhat.com> - 3-34
+- Make the %%py3_dist macro compatible with Python RPM generators
+Resolves: rhbz#1812665
+
+* Wed Mar 04 2020 Charalampos Stratakis <cstratak@redhat.com> - 3-33
+- Fix the %%py_build macro to respect the global definition of %%__python
+Resolves: rhbz#1757834
+
 * Wed Apr 24 2019 Miro Hrončok <mhroncok@redhat.com> - 3-32
 - %%python_provide: Obsolete and provide python36- from python3-
 - %%python_provide: Provide python3- from python36-