diff -ur Python/Misc/python-config.in Python.new/Misc/python-config.in
--- Python/Misc/python-config.in	2011-06-11 15:46:26 +0000
+++ Python.new/Misc/python-config.in	2011-10-19 14:41:29 +0000
@@ -37,10 +37,11 @@
         print sysconfig.EXEC_PREFIX
 
     elif opt in ('--includes', '--cflags'):
-        flags = ['-I' + sysconfig.get_python_inc(),
-                 '-I' + sysconfig.get_python_inc(plat_specific=True)]
-        if opt == '--cflags':
-            flags.extend(getvar('CFLAGS').split())
+        inc = sysconfig.get_python_inc()
+        inc_plat_specific = sysconfig.get_python_inc(plat_specific=True)
+        flags = ['-I' + inc]
+        if inc != inc_plat_specific:
+            flags.append('-I' + inc_plat_specific)
         print ' '.join(flags)
 
     elif opt in ('--libs', '--ldflags'):