diff --git a/config/ChangeLog b/config/ChangeLog
index ec4a0bef6c8596823b3b6237158706ab21c16395..5b23e6f383c43e137b6d4ac7f670f053eb498453 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-15  Mike Stump  <mikestump@comcast.net>
+
+	* mh-darwin: Turn off -pie on darwin11 and later.
+
 2011-04-20  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* bootstrap-lto.mk: Remove obsolete requirement.
diff --git a/config/mh-darwin b/config/mh-darwin
index 66f68b664a9572306dc8cb7a3d56781160d01c91..6a2f15f8efae132866eef94f22b18220738dc956 100644
--- a/config/mh-darwin
+++ b/config/mh-darwin
@@ -1,5 +1,7 @@
 # The -mdynamic-no-pic ensures that the compiler executable is built without
 # position-independent-code -- the usual default on Darwin. This fix speeds
 # compiles by 3-5%.
-
 BOOT_CFLAGS += -mdynamic-no-pic
+
+# Ensure we don't try and use -pie, as it is incompatible with pch.
+BOOT_LDFLAGS=`case ${host} in *-*-darwin[1][1-9]*) echo -Wl,-no_pie ;; esac;`