diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 90edc28fb41..87b0e9b5063 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-20  Kai Tietz  <ktietz@redhat.com>
+
+	* config.host (i686-*-mingw*): Set md_unwind_header only for dw2-mode
+	to w32-unwind.h header.
+
 2012-02-19  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* config.host (mips64*-*-linux*, mipsisa64*-*-linux*)
diff --git a/libgcc/config.host b/libgcc/config.host
index ee1a62c78bf..257622a09ff 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -606,6 +606,7 @@ i[34567]86-*-mingw*)
 		tmake_eh_file="i386/t-sjlj-eh"
 	else
 		tmake_eh_file="i386/t-dw2-eh"
+		md_unwind_header=i386/w32-unwind.h
 	fi
 	# Shared libgcc DLL install dir depends on cross/native build.
 	if test x${build} = x${host} ; then
@@ -614,7 +615,6 @@ i[34567]86-*-mingw*)
 		tmake_dlldir_file="i386/t-dlldir-x"
 	fi
 	tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-slibgcc-cygming i386/t-cygming i386/t-mingw32 i386/t-crtfm i386/t-chkstk t-dfprules"
-	md_unwind_header=i386/w32-unwind.h
 	;;
 x86_64-*-mingw*)
 	case ${target_thread_file} in