diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5cb671540f..94cb46e099 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-16  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* emulparams/elf32_x86_64.sh (LIBPATH_SUFFIX): Changed to
+	x32 for x32.
+
 2011-02-15  Kai Tietz  <kai.tietz@onevision.com>
 
 	* pe-dll.c (process_def_file_and_drectve): Don't strip
diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh
index 6dc13fc46f..8895e29344 100644
--- a/ld/emulparams/elf32_x86_64.sh
+++ b/ld/emulparams/elf32_x86_64.sh
@@ -28,7 +28,7 @@ fi
 case "$target" in
   x86_64*-linux*|i[3-7]86-*-linux-*)
     case "$EMULATION_NAME" in
-      *32*) LIBPATH_SUFFIX=32 ;;
+      *32*) LIBPATH_SUFFIX=x32 ;;
       *64*) LIBPATH_SUFFIX=64 ;;
     esac
     ;;