diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index fd1bc71ca2f15174eb3dd72d14c99955968d9bc8..125fb1e386224d33c7a78487f828cec3efae05e3 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-20  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac: Use -fPIC for symbol versioning test.
+	* configure: Regenerate.
+
 2005-08-17  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* ALL: Update FSF address.
diff --git a/libssp/configure b/libssp/configure
index e603accfb822f7ac624360322ecf124ee428ef53..396bf5c355b1f352dd3cb060caac4c2ae6b53a9f 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -3404,7 +3404,7 @@ FOO_1.0 {
 };
 EOF
 save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -shared -Wl,--version-script,./conftest.map"
+LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
diff --git a/libssp/configure.ac b/libssp/configure.ac
index 05c84f6f70ae196fbcdb221f60e632a7831ae8b0..0bec15c140fc06aeebce8f89ef6fddbdda5f20b8 100644
--- a/libssp/configure.ac
+++ b/libssp/configure.ac
@@ -75,7 +75,7 @@ FOO_1.0 {
 };
 EOF
 save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -shared -Wl,--version-script,./conftest.map"
+LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
 AC_TRY_LINK([int foo;],[],[ssp_use_symver=yes],[ssp_use_symver=no])
 LDFLAGS="$save_LDFLAGS"
 AC_MSG_RESULT($ssp_use_symver)