diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 87d2444b48b..ba77c9926d1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-01  Geoffrey Keating  <geoffk@apple.com>
+
+	* config/darwin.h (LINK_SPEC): Pass -fpie through to the linker.
+
 2007-06-01  Ian Lance Taylor  <iant@google.com>
 
 	* tree-vrp.c (compare_name_with_value): Always set
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 339e53a9507..9d7fdb1d7e6 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -307,6 +307,7 @@ extern GTY(()) int darwin_ms_struct;
      %:version-compare(< 10.5 mmacosx-version-min= -multiply_defined) \
      %:version-compare(< 10.5 mmacosx-version-min= suppress)}} \
    %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
+   %{fpie:-pie} \
    %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
    %{read_only_relocs} \
    %{sectcreate*} %{sectorder*} %{seg1addr*} %{segprot*} \
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d4256893a1..759dd3c9374 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-01  Geoffrey Keating  <geoffk@apple.com>
+
+	* gcc.dg/pie-link.c: New test.
+
 2007-06-01  Ian Lance Taylor  <iant@google.com>
 
 	* gcc.dg/Wstrict-overflow-17.c: New test.
diff --git a/gcc/testsuite/gcc.dg/pie-link.c b/gcc/testsuite/gcc.dg/pie-link.c
new file mode 100644
index 00000000000..00ff49597ed
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pie-link.c
@@ -0,0 +1,7 @@
+/* { dg-do link { target *-*-darwin[912]* *-*-linux* } } */
+/* { dg-options "-fpie" } */
+
+int main(void)
+{
+  return 0;
+}