diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset
index d518a0001..60cda5c9f 100644
--- a/dev-lang/python/patches/python-2.7.6.patchset
+++ b/dev-lang/python/patches/python-2.7.6.patchset
@@ -1,4 +1,4 @@
-From 2e6d0a2e4c715dd9a3ef2ce19ae6389a6dd4e0c7 Mon Sep 17 00:00:00 2001
+From bd2ce0285f6664a5fb6d1c7fdc590561bebf500f Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 12 Mar 2014 21:17:06 +0000
 Subject: initial Haiku patch
@@ -759,7 +759,7 @@ index 40ad843..24621ef 100644
 1.8.3.4
 
 
-From 077cde20cfcd287454dcc131e10c00a0c7bb6e2e Mon Sep 17 00:00:00 2001
+From 0a4292a9f64ebbb69ec9863b3397b1d2e9b30538 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 5 Apr 2014 21:16:40 +0000
 Subject: fix pyconfig.h path
@@ -782,7 +782,7 @@ index cf75650..bb54b6f 100644
 1.8.3.4
 
 
-From 6123b9d003eb7c5dd8f7cb468b8937061dc8f0dd Mon Sep 17 00:00:00 2001
+From 4c3a87e1bf6ec0a7bb5ae2e8da3620ab17268697 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Wed, 18 Jun 2014 12:19:13 +0000
 Subject: Import missed change from the 2.6.9 patches
@@ -813,3 +813,26 @@ index f1b0ae8..c18a7dd 100644
 -- 
 1.8.3.4
 
+
+From 818b7cffe7fa08b66a1e395db39f7d85ae42fb67 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 21 Sep 2014 18:59:44 +0200
+Subject: gcc2 fix.
+
+
+diff --git a/Modules/_ctypes/libffi/include/ffi_common.h b/Modules/_ctypes/libffi/include/ffi_common.h
+index 650ca69..02a1913 100644
+--- a/Modules/_ctypes/libffi/include/ffi_common.h
++++ b/Modules/_ctypes/libffi/include/ffi_common.h
+@@ -115,7 +115,7 @@ typedef signed int   SINT64 __attribute__((__mode__(__DI__)));
+ 
+ typedef float FLOAT32;
+ 
+-#ifndef __GNUC__
++#if !defined(__GNUC__) || __GNUC__ < 3
+ #define __builtin_expect(x, expected_value) (x)
+ #endif
+ #define LIKELY(x)    __builtin_expect(!!(x),1)
+-- 
+1.8.3.4
+
diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe
index 86258d1fa..40ca699f0 100644
--- a/dev-lang/python/python-2.7.6.recipe
+++ b/dev-lang/python/python-2.7.6.recipe
@@ -13,7 +13,7 @@ LICENSE="Python"
 COPYRIGHT="1990-2012, Python Software Foundation"
 SRC_URI="https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz"
 CHECKSUM_SHA256="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 !x86 x86_64"
 
 PATCHES="python-2.7.6.patchset"
@@ -41,9 +41,11 @@ REQUIRES="
 	lib:libreadline
 	lib:libsqlite3
 	lib:libz
+	lib:libffi
 	"
 BUILD_REQUIRES="
 	devel:libbz2
+	devel:libffi
 	devel:libncurses
 	devel:libssl
 	devel:libreadline
@@ -59,6 +61,7 @@ BUILD_PREREQUIRES="
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:pkg_config
 	"
 
 SOURCE_DIR="Python-2.7.6"
@@ -76,7 +79,7 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	runConfigure ./configure \
+	runConfigure ./configure --with-system-ffi \
 		--enable-shared \
 		--enable-unicode=ucs4