diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3aa9c712b4..44f20e161c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-20  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* emultempl/pe.em (gld_${EMULATION_NAME}_before_parse): Make
+	auto-import and merge-rdata defaults same for i[3-7]86 and  
+	and x86_64 mingw.
+	
 2010-06-15  Joseph Myers  <joseph@codesourcery.com>
 
 	* emulparams/elf32_tic6x_le.sh (ATTRS_SECTIONS): Define.
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 3185336c18..a29f2e387f 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -174,7 +174,7 @@ case ${target} in
     default_auto_import=1
     default_merge_rdata=1
     ;;
-  *-w64-mingw*)
+  i[3-7]86-*-mingw* | x86_64-*-mingw*)
     default_auto_import=1
     default_merge_rdata=0
     ;;