diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index cf25b66d..33a9c6b3 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -139,8 +139,8 @@ install_package_using() {
 
 apply_patches() {
   local package_name="$1"
-  local patches_path="${PYTHON_BUILD_ROOT}/patches/${DEFINITION_PATH##*/}/${package_name}"
-  for patch in "${patches_path}"/*; do
+  local patches_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}"
+  for patch in "${patches_path}/${package_name}/"*; do
     if [ -f "$patch" ]; then
       echo "Applying ${patch##*/} to ${package_name}..." >&2
       patch -p0 < "$patch"
@@ -666,7 +666,7 @@ usage() {
 
 list_definitions() {
   { for definition in "${PYTHON_BUILD_ROOT}/share/python-build/"*; do
-      echo "${definition##*/}"
+      [ -f "${definition}" ] && echo "${definition##*/}"
     done
   } | sort
 }
diff --git a/plugins/python-build/install.sh b/plugins/python-build/install.sh
index 8b7a874b..efb68400 100755
--- a/plugins/python-build/install.sh
+++ b/plugins/python-build/install.sh
@@ -17,7 +17,7 @@ for file in bin/*; do
 done
 
 for file in share/python-build/*; do
-  cp "${file}" "${SHARE_PATH}"
+  cp -Rp "${file}" "${SHARE_PATH}"
 done
 
 echo "Installed python-build at ${PREFIX}"
diff --git a/plugins/python-build/patches/2.5.1/Python-2.5.1/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.1/Python-2.5.1/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.1/Python-2.5.1/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.1/Python-2.5.1/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5.2/Python-2.5.2/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.2/Python-2.5.2/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.2/Python-2.5.2/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.2/Python-2.5.2/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5.3/Python-2.5.3/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.3/Python-2.5.3/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.3/Python-2.5.3/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.3/Python-2.5.3/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5.4/Python-2.5.4/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.4/Python-2.5.4/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.4/Python-2.5.4/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.4/Python-2.5.4/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5.5/Python-2.5.5/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.5/Python-2.5.5/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.5/Python-2.5.5/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.5/Python-2.5.5/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5.6/Python-2.5.6/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5.6/Python-2.5.6/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5.6/Python-2.5.6/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5.6/Python-2.5.6/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.5/Python-2.5/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/2.5/Python-2.5/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/2.6.6/Python-2.6.6/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.6.6/Python-2.6.6/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.6.6/Python-2.6.6/001_openssl_no_ssl2.patch b/plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/001_openssl_no_ssl2.patch
similarity index 100%
rename from plugins/python-build/patches/2.6.6/Python-2.6.6/001_openssl_no_ssl2.patch
rename to plugins/python-build/share/python-build/patches/2.6.6/Python-2.6.6/001_openssl_no_ssl2.patch
diff --git a/plugins/python-build/patches/2.6.7/Python-2.6.7/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.6.7/Python-2.6.7/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.6.7/Python-2.6.7/001_openssl_no_ssl2.patch b/plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/001_openssl_no_ssl2.patch
similarity index 100%
rename from plugins/python-build/patches/2.6.7/Python-2.6.7/001_openssl_no_ssl2.patch
rename to plugins/python-build/share/python-build/patches/2.6.7/Python-2.6.7/001_openssl_no_ssl2.patch
diff --git a/plugins/python-build/patches/2.6.8/Python-2.6.8/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.6.8/Python-2.6.8/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.6.8/Python-2.6.8/001_openssl_no_ssl2.patch b/plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/001_openssl_no_ssl2.patch
similarity index 100%
rename from plugins/python-build/patches/2.6.8/Python-2.6.8/001_openssl_no_ssl2.patch
rename to plugins/python-build/share/python-build/patches/2.6.8/Python-2.6.8/001_openssl_no_ssl2.patch
diff --git a/plugins/python-build/patches/2.7.1/Python-2.7.1/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.7.1/Python-2.7.1/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.7.1/Python-2.7.1/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.7.1/Python-2.7.1/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/2.7/Python-2.7/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/3.0.1/Python-3.0.1/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/3.0.1/Python-3.0.1/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/3.0.1/Python-3.0.1/001_patch-svnversion.patch b/plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/001_patch-svnversion.patch
similarity index 100%
rename from plugins/python-build/patches/3.0.1/Python-3.0.1/001_patch-svnversion.patch
rename to plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/001_patch-svnversion.patch
diff --git a/plugins/python-build/patches/3.0.1/Python-3.0.1/002_openssl_no_ssl2.patch b/plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/002_openssl_no_ssl2.patch
similarity index 100%
rename from plugins/python-build/patches/3.0.1/Python-3.0.1/002_openssl_no_ssl2.patch
rename to plugins/python-build/share/python-build/patches/3.0.1/Python-3.0.1/002_openssl_no_ssl2.patch
diff --git a/plugins/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/3.1.3/Python-3.1.3/000_patch-setup.py.diff
diff --git a/plugins/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff b/plugins/python-build/share/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff
similarity index 100%
rename from plugins/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff
rename to plugins/python-build/share/python-build/patches/3.2/Python-3.2/000_patch-setup.py.diff