diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4b6c530f59..d6e3c2198c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26  Kai Tietz  <kai.tietz@onevision.com>
+
+	* config/tc-i386.c (md_begin): Set for x64 windows COFF target
+	x86_dwarf2_return_column to 32.
+
 2011-01-20  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/12384
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index ac15e81450..0028f1769a 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -2371,7 +2371,12 @@ md_begin ()
 
   if (flag_code == CODE_64BIT)
     {
+#if defined (OBJ_COFF) && defined (TE_PE)
+      x86_dwarf2_return_column = (OUTPUT_FLAVOR == bfd_target_coff_flavour
+				  ? 32 : 16);
+#else
       x86_dwarf2_return_column = 16;
+#endif
       x86_cie_data_alignment = -8;
     }
   else