diff --git a/plugins/python-build/README.md b/plugins/python-build/README.md
index bf5206ea..75a7777e 100644
--- a/plugins/python-build/README.md
+++ b/plugins/python-build/README.md
@@ -102,7 +102,7 @@ process.
 * `MAKE_OPTS` (or `MAKEOPTS`) lets you pass additional options to
   `make`.
 * `PYTHON_CONFIGURE_OPTS` and `PYTHON_MAKE_OPTS` allow you to specify
-  configure and make options for buildling MRI. These variables will
+  configure and make options for buildling CPython. These variables will
   be passed to Python only, not any dependent packages (e.g. libyaml).
 
 ### Checksum verification
diff --git a/plugins/python-build/share/python-build/2.5 b/plugins/python-build/share/python-build/2.5
index ae56b408..72bca7c5 100644
--- a/plugins/python-build/share/python-build/2.5
+++ b/plugins/python-build/share/python-build/2.5
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5" "http://www.python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.1 b/plugins/python-build/share/python-build/2.5.1
index 4e8c5b55..a561a06b 100644
--- a/plugins/python-build/share/python-build/2.5.1
+++ b/plugins/python-build/share/python-build/2.5.1
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.1" "http://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#cca695828df8adc3e69b637af07522e1"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.2 b/plugins/python-build/share/python-build/2.5.2
index b0c9972a..b97ad835 100644
--- a/plugins/python-build/share/python-build/2.5.2
+++ b/plugins/python-build/share/python-build/2.5.2
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.2" "http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#3f7ca8aa86c6bd275426d63b46e07992"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.3 b/plugins/python-build/share/python-build/2.5.3
index 8c850911..412af2ae 100644
--- a/plugins/python-build/share/python-build/2.5.3
+++ b/plugins/python-build/share/python-build/2.5.3
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.3" "http://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#a971f8928d6beb31ae0de56f7034d6a2"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.4 b/plugins/python-build/share/python-build/2.5.4
index 9a12214a..095064db 100644
--- a/plugins/python-build/share/python-build/2.5.4
+++ b/plugins/python-build/share/python-build/2.5.4
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.4" "http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#ad47b23778f64edadaaa8b5534986eed"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.5 b/plugins/python-build/share/python-build/2.5.5
index 1ca5257e..df1844eb 100644
--- a/plugins/python-build/share/python-build/2.5.5
+++ b/plugins/python-build/share/python-build/2.5.5
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.5" "http://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#abc02139ca38f4258e8e372f7da05c88"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
diff --git a/plugins/python-build/share/python-build/2.5.6 b/plugins/python-build/share/python-build/2.5.6
index 78ce5701..30c3f13b 100644
--- a/plugins/python-build/share/python-build/2.5.6
+++ b/plugins/python-build/share/python-build/2.5.6
@@ -1,13 +1,3 @@
-case "$OSTYPE" in
-linux*)
-  case $(uname -m) in
-  x86_64)
-    export LDFLAGS="-L/usr/lib/x86_64-linux-gnu" # to fix build on Debian amd64
-    ;;
-  esac
-  ;;
-esac
-
 install_package "Python-2.5.6" "http://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#d1d9c83928561addf11d00b22a18ca50"
 install_package "distribute-0.6.36" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.36.tar.gz#a923385de72dcdca68cd4ac2b9dc1148" python
 install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python