diff --git a/libexec/pyenv-help b/libexec/pyenv-help
index 9b7f7e4a..b5b49c06 100755
--- a/libexec/pyenv-help
+++ b/libexec/pyenv-help
@@ -36,7 +36,7 @@ extract_initial_comment_block() {
 }
 
 collect_documentation() {
-  awk '
+  $(type -p gawk awk | head -1) '
     /^Summary:/ {
       summary = substr($0, 10)
       next
diff --git a/libexec/pyenv-version-file-read b/libexec/pyenv-version-file-read
index 64d7f76e..24dc3c63 100755
--- a/libexec/pyenv-version-file-read
+++ b/libexec/pyenv-version-file-read
@@ -9,7 +9,7 @@ if [ -e "$VERSION_FILE" ]; then
   # Read the first non-whitespace word from the specified version file.
   # Be careful not to load it whole in case there's something crazy in it.
   IFS="${IFS}"$'\r'
-  words=( $(cut -b 1-1024 "$VERSION_FILE" | awk '{ print($1) }') )
+  words=( $(cut -b 1-1024 "$VERSION_FILE" | $(type -p gawk awk | head -1) '{ print($1) }') )
   versions=("${words[@]}")
 
   if [ -n "$versions" ]; then
diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index 1c30ac8c..677f5c8b 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -45,7 +45,7 @@ usage() {
 
 definitions() {
   local query="$1"
-  python-build --definitions | grep -F "$query" || true
+  python-build --definitions | $(type -p ggrep grep | head -1) -F "$query" || true
 }
 
 indent() {
diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 13bc3264..56834874 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PYTHON_BUILD_VERSION="20140408"
+PYTHON_BUILD_VERSION="20140420"
 
 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -284,7 +284,8 @@ fetch_tarball() {
   fi
 
   if ! reuse_existing_tarball "$package_filename" "$checksum"; then
-    echo "Downloading ${package_filename}..." >&2
+    local tarball_filename=$(basename $package_url)
+    echo "Downloading ${tarball_filename}..." >&2
     http head "$mirror_url" &&
     download_tarball "$mirror_url" "$package_filename" "$checksum" ||
     download_tarball "$package_url" "$package_filename" "$checksum"
diff --git a/plugins/python-build/share/python-build/2.6.6 b/plugins/python-build/share/python-build/2.6.6
index 108831b3..34ea99a9 100644
--- a/plugins/python-build/share/python-build/2.6.6
+++ b/plugins/python-build/share/python-build/2.6.6
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" ldflags_dirs standard verify_py26
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.6.7 b/plugins/python-build/share/python-build/2.6.7
index 7600aea4..1ba1e56b 100644
--- a/plugins/python-build/share/python-build/2.6.7
+++ b/plugins/python-build/share/python-build/2.6.7
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" ldflags_dirs standard verify_py26
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.6.8 b/plugins/python-build/share/python-build/2.6.8
index a4a601df..3f2980c6 100644
--- a/plugins/python-build/share/python-build/2.6.8
+++ b/plugins/python-build/share/python-build/2.6.8
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" ldflags_dirs standard verify_py26
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.6.9 b/plugins/python-build/share/python-build/2.6.9
index a8200ed8..a9c2c221 100644
--- a/plugins/python-build/share/python-build/2.6.9
+++ b/plugins/python-build/share/python-build/2.6.9
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#bddbd64bf6f5344fc55bbe49a72fe4f3" ldflags_dirs standard verify_py26
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7 b/plugins/python-build/share/python-build/2.7
index 0d4fbfd3..b5a134d9 100644
--- a/plugins/python-build/share/python-build/2.7
+++ b/plugins/python-build/share/python-build/2.7
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7-dev b/plugins/python-build/share/python-build/2.7-dev
index 1b121ca2..1e35c327 100644
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.1 b/plugins/python-build/share/python-build/2.7.1
index d9d48bd1..12a54b13 100644
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.2 b/plugins/python-build/share/python-build/2.7.2
index c8a3098d..50a0a341 100644
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.3 b/plugins/python-build/share/python-build/2.7.3
index 90d43e45..9f91e5b5 100644
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.4 b/plugins/python-build/share/python-build/2.7.4
index c1244bfe..7c6472c4 100644
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.5 b/plugins/python-build/share/python-build/2.7.5
index 3862ff62..d8285ad1 100644
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/2.7.6 b/plugins/python-build/share/python-build/2.7.6
index 0ce4c620..260ddeab 100644
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#1d8728eb0dfcac72a0fd99c17ec7f386" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.0.1 b/plugins/python-build/share/python-build/3.0.1
index cddc1879..eed38545 100644
--- a/plugins/python-build/share/python-build/3.0.1
+++ b/plugins/python-build/share/python-build/3.0.1
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" ldflags_dirs standard verify_py30
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.1-dev b/plugins/python-build/share/python-build/3.1-dev
index 59f1c567..dab19cf3 100644
--- a/plugins/python-build/share/python-build/3.1-dev
+++ b/plugins/python-build/share/python-build/3.1-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.1.3 b/plugins/python-build/share/python-build/3.1.3
index a541e94d..fd32b5ef 100644
--- a/plugins/python-build/share/python-build/3.1.3
+++ b/plugins/python-build/share/python-build/3.1.3
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" ldflags_dirs standard verify_py31
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.1.4 b/plugins/python-build/share/python-build/3.1.4
index c443029c..35f37700 100644
--- a/plugins/python-build/share/python-build/3.1.4
+++ b/plugins/python-build/share/python-build/3.1.4
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" ldflags_dirs standard verify_py31
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.1.5 b/plugins/python-build/share/python-build/3.1.5
index 3c87deaf..cfa91982 100644
--- a/plugins/python-build/share/python-build/3.1.5
+++ b/plugins/python-build/share/python-build/3.1.5
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" ldflags_dirs standard verify_py31
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2 b/plugins/python-build/share/python-build/3.2
index 2b78ddee..a336faa5 100644
--- a/plugins/python-build/share/python-build/3.2
+++ b/plugins/python-build/share/python-build/3.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2-dev b/plugins/python-build/share/python-build/3.2-dev
index 3c758598..483a12bf 100644
--- a/plugins/python-build/share/python-build/3.2-dev
+++ b/plugins/python-build/share/python-build/3.2-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2.1 b/plugins/python-build/share/python-build/3.2.1
index 423d701d..60b77c80 100644
--- a/plugins/python-build/share/python-build/3.2.1
+++ b/plugins/python-build/share/python-build/3.2.1
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2.2 b/plugins/python-build/share/python-build/3.2.2
index 8f83c430..b11d1bc1 100644
--- a/plugins/python-build/share/python-build/3.2.2
+++ b/plugins/python-build/share/python-build/3.2.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2.3 b/plugins/python-build/share/python-build/3.2.3
index be547199..789f28e1 100644
--- a/plugins/python-build/share/python-build/3.2.3
+++ b/plugins/python-build/share/python-build/3.2.3
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2.4 b/plugins/python-build/share/python-build/3.2.4
index d890ee44..480cab8f 100644
--- a/plugins/python-build/share/python-build/3.2.4
+++ b/plugins/python-build/share/python-build/3.2.4
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.2.5 b/plugins/python-build/share/python-build/3.2.5
index 674b693b..fc9f298e 100644
--- a/plugins/python-build/share/python-build/3.2.5
+++ b/plugins/python-build/share/python-build/3.2.5
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3-dev b/plugins/python-build/share/python-build/3.3-dev
index a461b67b..7f5d44c1 100644
--- a/plugins/python-build/share/python-build/3.3-dev
+++ b/plugins/python-build/share/python-build/3.3-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.0 b/plugins/python-build/share/python-build/3.3.0
index 07bb62b6..e0c3a7c6 100644
--- a/plugins/python-build/share/python-build/3.3.0
+++ b/plugins/python-build/share/python-build/3.3.0
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.1 b/plugins/python-build/share/python-build/3.3.1
index 46ec11e0..2f13cf6b 100644
--- a/plugins/python-build/share/python-build/3.3.1
+++ b/plugins/python-build/share/python-build/3.3.1
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.2 b/plugins/python-build/share/python-build/3.3.2
index fe3489d5..6ef398f2 100644
--- a/plugins/python-build/share/python-build/3.3.2
+++ b/plugins/python-build/share/python-build/3.3.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.3 b/plugins/python-build/share/python-build/3.3.3
index ef55a7a7..ae2e1541 100644
--- a/plugins/python-build/share/python-build/3.3.3
+++ b/plugins/python-build/share/python-build/3.3.3
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#831d59212568dc12c95df222865d3441" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.4 b/plugins/python-build/share/python-build/3.3.4
index 3c91932a..bcf8faea 100644
--- a/plugins/python-build/share/python-build/3.3.4
+++ b/plugins/python-build/share/python-build/3.3.4
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.4" "http://python.org/ftp/python/3.3.4/Python-3.3.4.tgz#9f7df0dde690132c63b1dd2b640ed3a6" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/3.3.5 b/plugins/python-build/share/python-build/3.3.5
index 57f828b1..37dade98 100644
--- a/plugins/python-build/share/python-build/3.3.5
+++ b/plugins/python-build/share/python-build/3.3.5
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.5" "http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz#803a75927f8f241ca78633890c798021" ldflags_dirs standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/anaconda-1.4.0 b/plugins/python-build/share/python-build/anaconda-1.4.0
index e2e5d7b0..5bb273f1 100644
--- a/plugins/python-build/share/python-build/anaconda-1.4.0
+++ b/plugins/python-build/share/python-build/anaconda-1.4.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo ": Precompiled binary of anaconda-1.4.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.5.0 b/plugins/python-build/share/python-build/anaconda-1.5.0
index c474a8e3..6c2817d4 100644
--- a/plugins/python-build/share/python-build/anaconda-1.5.0
+++ b/plugins/python-build/share/python-build/anaconda-1.5.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.5.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.5.1 b/plugins/python-build/share/python-build/anaconda-1.5.1
index 67af4bb5..b46cafe9 100644
--- a/plugins/python-build/share/python-build/anaconda-1.5.1
+++ b/plugins/python-build/share/python-build/anaconda-1.5.1
@@ -5,7 +5,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.5.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.6.0 b/plugins/python-build/share/python-build/anaconda-1.6.0
index fb61eec1..35207b8a 100644
--- a/plugins/python-build/share/python-build/anaconda-1.6.0
+++ b/plugins/python-build/share/python-build/anaconda-1.6.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.6.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.6.1 b/plugins/python-build/share/python-build/anaconda-1.6.1
index d71bf980..f0b20324 100644
--- a/plugins/python-build/share/python-build/anaconda-1.6.1
+++ b/plugins/python-build/share/python-build/anaconda-1.6.1
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.6.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.7.0 b/plugins/python-build/share/python-build/anaconda-1.7.0
index baa939a2..830860d4 100644
--- a/plugins/python-build/share/python-build/anaconda-1.7.0
+++ b/plugins/python-build/share/python-build/anaconda-1.7.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.7.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.8.0 b/plugins/python-build/share/python-build/anaconda-1.8.0
index bbe66a61..055ffe9c 100644
--- a/plugins/python-build/share/python-build/anaconda-1.8.0
+++ b/plugins/python-build/share/python-build/anaconda-1.8.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.8.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.9.0 b/plugins/python-build/share/python-build/anaconda-1.9.0
index 6482e452..1acc899e 100644
--- a/plugins/python-build/share/python-build/anaconda-1.9.0
+++ b/plugins/python-build/share/python-build/anaconda-1.9.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.9.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.9.1 b/plugins/python-build/share/python-build/anaconda-1.9.1
index 8def91e3..1e5897cd 100644
--- a/plugins/python-build/share/python-build/anaconda-1.9.1
+++ b/plugins/python-build/share/python-build/anaconda-1.9.1
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.9.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.9.2 b/plugins/python-build/share/python-build/anaconda-1.9.2
index 45da507b..d1127f15 100644
--- a/plugins/python-build/share/python-build/anaconda-1.9.2
+++ b/plugins/python-build/share/python-build/anaconda-1.9.2
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.9.2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/ironpython-2.7.4 b/plugins/python-build/share/python-build/ironpython-2.7.4
index a732bba6..bd0b2ddb 100644
--- a/plugins/python-build/share/python-build/ironpython-2.7.4
+++ b/plugins/python-build/share/python-build/ironpython-2.7.4
@@ -1,4 +1,4 @@
 install_zip "IronPython-2.7.4" "https://github.com/IronLanguages/main/releases/download/ipy-2.7.4/IronPython-2.7.4.zip#30c9186a6e2efe7c1e3046ec62900916" ironpython
 # FIXME: have not confirmed to install setuptools into IronPython yet
 #install_package "setuptools-3.4.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.1.tar.gz#252a38c6b25f1ac446ba6983095dbf3f" python
-#install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+#install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/ironpython-dev b/plugins/python-build/share/python-build/ironpython-dev
index c9f904cf..c630f598 100644
--- a/plugins/python-build/share/python-build/ironpython-dev
+++ b/plugins/python-build/share/python-build/ironpython-dev
@@ -1,4 +1,4 @@
 install_git "ironpython-dev" "https://github.com/IronLanguages/main.git" master ironpython_builder
 # FIXME: have not confirmed to install setuptools into IronPython yet
 #install_package "setuptools-3.4.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.1.tar.gz#252a38c6b25f1ac446ba6983095dbf3f" python
-#install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+#install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/jython-2.7-beta1 b/plugins/python-build/share/python-build/jython-2.7-beta1
index d18e07c9..c8376f6b 100644
--- a/plugins/python-build/share/python-build/jython-2.7-beta1
+++ b/plugins/python-build/share/python-build/jython-2.7-beta1
@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
diff --git a/plugins/python-build/share/python-build/jython-dev b/plugins/python-build/share/python-build/jython-dev
index b192405d..231ce748 100644
--- a/plugins/python-build/share/python-build/jython-dev
+++ b/plugins/python-build/share/python-build/jython-dev
@@ -1,6 +1,6 @@
 require_java
 install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
diff --git a/plugins/python-build/share/python-build/miniconda-2.2.2 b/plugins/python-build/share/python-build/miniconda-2.2.2
index 343acab3..52fa5cfd 100644
--- a/plugins/python-build/share/python-build/miniconda-2.2.2
+++ b/plugins/python-build/share/python-build/miniconda-2.2.2
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-2.2.2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.0 b/plugins/python-build/share/python-build/miniconda-3.0.0
index b61cb655..1bcb345d 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.0
+++ b/plugins/python-build/share/python-build/miniconda-3.0.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.4 b/plugins/python-build/share/python-build/miniconda-3.0.4
index 13ee01b8..c72c357a 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.4
+++ b/plugins/python-build/share/python-build/miniconda-3.0.4
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.4 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.5 b/plugins/python-build/share/python-build/miniconda-3.0.5
index 8f4667af..195694e8 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.5
+++ b/plugins/python-build/share/python-build/miniconda-3.0.5
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.5 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.3.0 b/plugins/python-build/share/python-build/miniconda-3.3.0
index b1e1843d..97226027 100644
--- a/plugins/python-build/share/python-build/miniconda-3.3.0
+++ b/plugins/python-build/share/python-build/miniconda-3.3.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.3.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-2.2.2 b/plugins/python-build/share/python-build/miniconda3-2.2.2
index e4a75246..63521000 100644
--- a/plugins/python-build/share/python-build/miniconda3-2.2.2
+++ b/plugins/python-build/share/python-build/miniconda3-2.2.2
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-2.2.2 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.0 b/plugins/python-build/share/python-build/miniconda3-3.0.0
index 30b62f09..f4a2e3ac 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.0
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.4 b/plugins/python-build/share/python-build/miniconda3-3.0.4
index 4ccadc10..ef80489b 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.4
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.4
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.4 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.5 b/plugins/python-build/share/python-build/miniconda3-3.0.5
index eebf8d07..8f1a3804 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.5
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.5
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.5 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.3.0 b/plugins/python-build/share/python-build/miniconda3-3.3.0
index 9236e4c2..0f71cbdf 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.3.0
+++ b/plugins/python-build/share/python-build/miniconda3-3.3.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.3.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/pypy-1.5 b/plugins/python-build/share/python-build/pypy-1.5
index 52f2ff01..94a84503 100644
--- a/plugins/python-build/share/python-build/pypy-1.5
+++ b/plugins/python-build/share/python-build/pypy-1.5
@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.5-src b/plugins/python-build/share/python-build/pypy-1.5-src
index af90e114..7cefd563 100644
--- a/plugins/python-build/share/python-build/pypy-1.5-src
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.6 b/plugins/python-build/share/python-build/pypy-1.6
index 28f153ff..6e5a4576 100644
--- a/plugins/python-build/share/python-build/pypy-1.6
+++ b/plugins/python-build/share/python-build/pypy-1.6
@@ -22,5 +22,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.7 b/plugins/python-build/share/python-build/pypy-1.7
index f77b79b9..845f06cf 100644
--- a/plugins/python-build/share/python-build/pypy-1.7
+++ b/plugins/python-build/share/python-build/pypy-1.7
@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.7-dev b/plugins/python-build/share/python-build/pypy-1.7-dev
index 65573a9b..c5144f88 100644
--- a/plugins/python-build/share/python-build/pypy-1.7-dev
+++ b/plugins/python-build/share/python-build/pypy-1.7-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.8 b/plugins/python-build/share/python-build/pypy-1.8
index e923c090..7050e75f 100644
--- a/plugins/python-build/share/python-build/pypy-1.8
+++ b/plugins/python-build/share/python-build/pypy-1.8
@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.8-dev b/plugins/python-build/share/python-build/pypy-1.8-dev
index 61876698..625f8d9a 100644
--- a/plugins/python-build/share/python-build/pypy-1.8-dev
+++ b/plugins/python-build/share/python-build/pypy-1.8-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.9 b/plugins/python-build/share/python-build/pypy-1.9
index f131013c..e7fe19ae 100644
--- a/plugins/python-build/share/python-build/pypy-1.9
+++ b/plugins/python-build/share/python-build/pypy-1.9
@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-1.9-dev b/plugins/python-build/share/python-build/pypy-1.9-dev
index 73028411..6b38a1e2 100644
--- a/plugins/python-build/share/python-build/pypy-1.9-dev
+++ b/plugins/python-build/share/python-build/pypy-1.9-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0 b/plugins/python-build/share/python-build/pypy-2.0
index 1033727b..2c15bb98 100644
--- a/plugins/python-build/share/python-build/pypy-2.0
+++ b/plugins/python-build/share/python-build/pypy-2.0
@@ -45,5 +45,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0-dev b/plugins/python-build/share/python-build/pypy-2.0-dev
index c1177560..e34f4ab5 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-dev
+++ b/plugins/python-build/share/python-build/pypy-2.0-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0-src b/plugins/python-build/share/python-build/pypy-2.0-src
index a3cbf60a..7fe02ca4 100644
--- a/plugins/python-build/share/python-build/pypy-2.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.0-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#4dc82e2240dd2b5be313119672988538" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1 b/plugins/python-build/share/python-build/pypy-2.0.1
index 64bc8cc3..31e49023 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1
+++ b/plugins/python-build/share/python-build/pypy-2.0.1
@@ -37,5 +37,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1-src b/plugins/python-build/share/python-build/pypy-2.0.1-src
index 66273b3f..d65d9b60 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#34072be1eeb63f9d37cf387e58aae81d" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2 b/plugins/python-build/share/python-build/pypy-2.0.2
index bb80da83..aa8eeb1e 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2
+++ b/plugins/python-build/share/python-build/pypy-2.0.2
@@ -37,5 +37,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2-src b/plugins/python-build/share/python-build/pypy-2.0.2-src
index fd7ef94a..4d13faef 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.2-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#c26662e348159b460057548ddaf35333" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
index 92218f00..e8c487a7 100644
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.1-src b/plugins/python-build/share/python-build/pypy-2.1-src
index da681565..fb4125c8 100644
--- a/plugins/python-build/share/python-build/pypy-2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#7c43cd95aa37a7f0ca2465ed930646c0" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2 b/plugins/python-build/share/python-build/pypy-2.2
index 32a3d80f..330a57d5 100644
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2-src b/plugins/python-build/share/python-build/pypy-2.2-src
index 89f7c8f0..272d987a 100644
--- a/plugins/python-build/share/python-build/pypy-2.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.2-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#5a5a3822605d7d811066b1b279da3c6e" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1 b/plugins/python-build/share/python-build/pypy-2.2.1
index f1d57a33..7d13d434 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/plugins/python-build/share/python-build/pypy-2.2.1
@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1-src b/plugins/python-build/share/python-build/pypy-2.2.1-src
index 02c498fe..43d7ea3e 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.2.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#7ec9f48702323f9e93654ba73dd46720" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.3 b/plugins/python-build/share/python-build/pypy-2.3
new file mode 100644
index 00000000..67c28b53
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-2.3
@@ -0,0 +1,53 @@
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.3-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-linux.tar.bz2#e84a1179a63632c62e311363a409df56" "pypy" verify_py27
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.3-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-linux-armel.tar.bz2#391bda03d0642ebb3fa6d59ec90a1388" "pypy" verify_py27
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy-2.3-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-linux-armhf-raspbian.tar.bz2#0ab5df88c02b41f8f062b2893ccd5066" "pypy" verify_py27
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy-2.3-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-linux-armhf-raring.tar.bz2#cdb738317e958031d0752dff5a1742f1" "pypy" verify_py27
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.3-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-linux64.tar.bz2#2ae65fa6b0ea9ddffd50a02a40f27186" "pypy" verify_py27
+  ;;
+"osx64" )
+  install_package "pypy-2.3-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-osx64.tar.bz2#76b5d7798d3a9b8919f792df5a402bb2" "pypy" verify_py27
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy-2.3-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-win32.zip#55e0598ca9add0e7c78ffa49db6476c2" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy-2.3-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
+
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-2.3-src b/plugins/python-build/share/python-build/pypy-2.3-src
new file mode 100644
index 00000000..155473ad
--- /dev/null
+++ b/plugins/python-build/share/python-build/pypy-2.3-src
@@ -0,0 +1,4 @@
+require_gcc
+install_package "pypy-pypy-394146e9bb67" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-src.tar.bz2#c93a8e47f3b3109af2f66d2bd766eb97" "pypy_builder" verify_py27
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy-dev b/plugins/python-build/share/python-build/pypy-dev
index 81a6af42..e74697de 100644
--- a/plugins/python-build/share/python-build/pypy-dev
+++ b/plugins/python-build/share/python-build/pypy-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy3-2.1-beta1 b/plugins/python-build/share/python-build/pypy3-2.1-beta1
index effdb1be..cea7cb46 100644
--- a/plugins/python-build/share/python-build/pypy3-2.1-beta1
+++ b/plugins/python-build/share/python-build/pypy3-2.1-beta1
@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy3-2.1-beta1-src b/plugins/python-build/share/python-build/pypy3-2.1-beta1-src
index a5d4259b..2550cf4f 100644
--- a/plugins/python-build/share/python-build/pypy3-2.1-beta1-src
+++ b/plugins/python-build/share/python-build/pypy3-2.1-beta1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy3-2.1-beta1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-src.tar.bz2#bc2013d1927dc1c0c91228e566abd8da" "pypy_builder" verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/pypy3-dev b/plugins/python-build/share/python-build/pypy3-dev
index b80c832a..ba8c3506 100644
--- a/plugins/python-build/share/python-build/pypy3-dev
+++ b/plugins/python-build/share/python-build/pypy3-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-2.7-dev b/plugins/python-build/share/python-build/stackless-2.7-dev
index 83335659..9f896a8e 100644
--- a/plugins/python-build/share/python-build/stackless-2.7-dev
+++ b/plugins/python-build/share/python-build/stackless-2.7-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-2.7.2 b/plugins/python-build/share/python-build/stackless-2.7.2
index c4eeb5b4..798ea2f0 100644
--- a/plugins/python-build/share/python-build/stackless-2.7.2
+++ b/plugins/python-build/share/python-build/stackless-2.7.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#79a718db998f2cdd95478d2cb54d56f2" ldflags_dirs standard verify_py27
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-3.2-dev b/plugins/python-build/share/python-build/stackless-3.2-dev
index 98466d98..0e05709c 100644
--- a/plugins/python-build/share/python-build/stackless-3.2-dev
+++ b/plugins/python-build/share/python-build/stackless-3.2-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-3.2-dev" "http://hg.python.org/stackless" "3.2-slp" standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-3.2.2 b/plugins/python-build/share/python-build/stackless-3.2.2
index 219fbe17..60ee461b 100644
--- a/plugins/python-build/share/python-build/stackless-3.2.2
+++ b/plugins/python-build/share/python-build/stackless-3.2.2
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "stackless-322-export" "http://www.stackless.com/binaries/stackless-322-export.tar.bz2#3a3edcfb4240bdcc580cec2baea60af4" ldflags_dirs standard verify_py32
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-3.3-dev b/plugins/python-build/share/python-build/stackless-3.3-dev
index 7e33160e..8f487ec5 100644
--- a/plugins/python-build/share/python-build/stackless-3.3-dev
+++ b/plugins/python-build/share/python-build/stackless-3.3-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-3.3-dev" "http://hg.python.org/stackless" "3.3-slp" standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/share/python-build/stackless-dev b/plugins/python-build/share/python-build/stackless-dev
index 7bafe671..cc87563c 100644
--- a/plugins/python-build/share/python-build/stackless-dev
+++ b/plugins/python-build/share/python-build/stackless-dev
@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-dev" "http://hg.python.org/stackless" "default" standard verify_py33
-install_package "setuptools-3.4.4" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.4.4.tar.gz#6ca9e8377b65233c2ff3a1752406a22d" python
-install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
+install_package "setuptools-3.5.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.5.1.tar.gz#d0447ca5adeeac93ef43931c395788c3" python
+install_package "pip-1.5.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.5.tar.gz#7520581ba0687dec1ce85bd15496537b" python
diff --git a/plugins/python-build/test/test_helper.bash b/plugins/python-build/test/test_helper.bash
index 6bbc31ab..f4adba9c 100644
--- a/plugins/python-build/test/test_helper.bash
+++ b/plugins/python-build/test/test_helper.bash
@@ -115,7 +115,7 @@ assert_output() {
 
 assert_output_contains() {
   local expected="$1"
-  echo "$output" | grep -F "$expected" >/dev/null || {
+  echo "$output" | $(type -p ggrep grep | head -1) -F "$expected" >/dev/null || {
     { echo "expected output to contain $expected"
       echo "actual: $output"
     } | flunk