diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6d3c152ba16..8804bd5af26 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-19  Kai Tietz  <ktietz@redhat.com>
+
+	* configure.tgt (i386-*-cygwin): Handle x86_64 cygwin.
+
 2013-04-15  Julian Brown  <julian@codesourcery.com>
 
 	* expr.c (add_to_result, subtract_from_result): Make global.
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 445bab5d6f6..da6f65a184a 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -254,7 +254,11 @@ case ${generic_target} in
   i386-*-msdos*)			fmt=aout ;;
   i386-*-moss*)				fmt=elf ;;
   i386-*-pe)				fmt=coff em=pe ;;
-  i386-*-cygwin*)			fmt=coff em=pe ;;
+  i386-*-cygwin*)
+   case ${cpu} in
+     x86_64*)				fmt=coff em=pep ;;
+     i*)				fmt=coff em=pe ;;
+   esac ;;
   i386-*-interix*)			fmt=coff em=interix ;;
   i386-*-mingw*)
     case ${cpu} in