diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 1f3f1ea7..9f724e62 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1063,17 +1063,9 @@ build_package_verify_python() {
   local package_name="$1"
   local python="$2"
   if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
-    local path file
-    for path in bin include lib share; do
-      mkdir -p "${PREFIX_PATH}/${path}"
-      mv -f "${PREFIX_PATH}/${path}" "${PREFIX_PATH}/.${path}"
-      ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/${path}" "${PREFIX_PATH}/${path}"
-      find "${PREFIX_PATH}/.${path}" -type l -delete
-      for file in "${PREFIX_PATH}/.${path}/"*; do
-        [ -e "${file}" ] && cp -fR "${file}" "${PREFIX_PATH}/${path}"
-      done
-      rm -fr "${PREFIX_PATH}/.${path}"
-    done
+    # Only symlinks are installed in ${PREFIX_PATH}/bin
+    rm -fr "${PREFIX_PATH}/bin"
+    ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"
   fi
   if [ ! -e "${PREFIX_PATH}/bin/python" ] && [ -e "${PREFIX_PATH}/bin/${python}" ]; then
     ( cd "${PREFIX_PATH}/bin" && ln -fs "${python}" "python" )
@@ -1344,6 +1336,17 @@ if [[ "$CONFIGURE_OPTS" == *"--enable-shared"* ]] || [[ "$PYTHON_CONFIGURE_OPTS"
 fi
 
 if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
+  create_framework_dirs() {
+    local version="$(echo "$1" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+).*$/\1/')"
+    mkdir -p "${PREFIX_PATH}/Python.framework/Versions/${version}"
+    ( cd "${PREFIX_PATH}/Python.framework/Versions" && ln -fs "${version}" "Current")
+    local path
+    for path in include lib share; do
+      mkdir -p "${PREFIX_PATH}/Python.framework/Versions/Current/${path}"
+      ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/${path}" "${PREFIX_PATH}/${path}"
+    done
+  }
+  create_framework_dirs "${DEFINITION_PATH##*/}"
   package_option python configure --enable-framework="${PREFIX_PATH}"
 fi