diff --git a/plugins/python-build/share/python-build/3.7.3 b/plugins/python-build/share/python-build/3.7.3
index 48ad34bc..63418ead 100644
--- a/plugins/python-build/share/python-build/3.7.3
+++ b/plugins/python-build/share/python-build/3.7.3
@@ -2,7 +2,7 @@
 install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
 install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 if has_tar_xz_support; then
-  install_package "Python-3.7.3" "https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz#da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318" ldflags_dirs standard verify_py37 ensurepip
+  install_package "Python-3.7.3" "https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz#da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
 else
-  install_package "Python-3.7.3" "https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tgz#d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff" ldflags_dirs standard verify_py37 ensurepip
-fi
\ No newline at end of file
+  install_package "Python-3.7.3" "https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tgz#d62e3015f2f89c970ac52343976b406694931742fbde2fed8d1ce8ebb4e1f8ff" ldflags_dirs standard verify_py37 copy_python_gdb ensurepip
+fi
diff --git a/plugins/python-build/share/python-build/patches/2.4/Python-2.4/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.4/Python-2.4/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/000_patch-setup.py.diff
diff --git a/plugins/python-build/share/python-build/patches/2.4/Python-2.4/001_fortify_crash_workaround.diff b/plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/001_fortify_crash_workaround.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.4/Python-2.4/001_fortify_crash_workaround.diff
rename to plugins/python-build/share/python-build/patches/2.4.0/Python-2.4/001_fortify_crash_workaround.diff
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/000_patch-setup.py.diff
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/001_patch-svnversion.patch
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/002_darwin_c_source.patch b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/002_darwin_c_source.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/002_darwin_c_source.patch
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/002_darwin_c_source.patch
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/003_osx_lp64.patch b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/003_osx_lp64.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/003_osx_lp64.patch
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/003_osx_lp64.patch
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/004_osx_libffi.patch b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/004_osx_libffi.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/004_osx_libffi.patch
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/004_osx_libffi.patch
diff --git a/plugins/python-build/share/python-build/patches/2.5/Python-2.5/005_osx_failed_modules.patch b/plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/005_osx_failed_modules.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.5/Python-2.5/005_osx_failed_modules.patch
rename to plugins/python-build/share/python-build/patches/2.5.0/Python-2.5/005_osx_failed_modules.patch
diff --git a/plugins/python-build/share/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/000_patch-setup.py.diff
diff --git a/plugins/python-build/share/python-build/patches/2.7/Python-2.7/002_readline63.patch b/plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/002_readline63.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.7/Python-2.7/002_readline63.patch
rename to plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/002_readline63.patch
diff --git a/plugins/python-build/share/python-build/patches/2.7/Python-2.7/010_ssl_no_ssl2_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/010_ssl_no_ssl2_no_ssl3.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/2.7/Python-2.7/010_ssl_no_ssl2_no_ssl3.patch
rename to plugins/python-build/share/python-build/patches/2.7.0/Python-2.7/010_ssl_no_ssl2_no_ssl3.patch
diff --git a/plugins/python-build/share/python-build/patches/3.1/Python-3.1/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/3.1/Python-3.1/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/000_patch-setup.py.diff
diff --git a/plugins/python-build/share/python-build/patches/3.1/Python-3.1/010_ssl_no_ssl2_no_ssl3.patch b/plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/010_ssl_no_ssl2_no_ssl3.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/3.1/Python-3.1/010_ssl_no_ssl2_no_ssl3.patch
rename to plugins/python-build/share/python-build/patches/3.1.0/Python-3.1/010_ssl_no_ssl2_no_ssl3.patch
diff --git a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/share/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/000_patch-setup.py.diff
diff --git a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/002_readline63.patch b/plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/002_readline63.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/3.2/Python-3.2/002_readline63.patch
rename to plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/002_readline63.patch
diff --git a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch b/plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch
similarity index 100%
rename from plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch
rename to plugins/python-build/share/python-build/patches/3.2.0/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch