diff --git a/gas/ChangeLog b/gas/ChangeLog
index cd8a7723f9..ce29bfe7d3 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-19  Alan Modra  <amodra@gmail.com>
+
+    	PR 2606
+	* configure.in: Disable emulations for PE targets.
+	* configure: Regenerate.
+
 2010-11-18  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	PR gas/12181
diff --git a/gas/configure b/gas/configure
index 4b06ca44d7..d5431f28cd 100755
--- a/gas/configure
+++ b/gas/configure
@@ -12316,6 +12316,11 @@ if test ${all_targets} = "yes"; then
   esac
 fi
 
+# PE code has way too many macros tweaking behaviour
+case ${te_file} in
+  pe*) emulations="" ;;
+esac
+
 # Assign floating point type.  Most processors with FP support
 # IEEE FP.  On those that don't support FP at all, usually IEEE
 # is emulated.
diff --git a/gas/configure.in b/gas/configure.in
index 0d5e3e175c..c11d1dfe72 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -466,6 +466,11 @@ if test ${all_targets} = "yes"; then
   esac
 fi
 
+# PE code has way too many macros tweaking behaviour
+case ${te_file} in
+  pe*) emulations="" ;;
+esac
+
 # Assign floating point type.  Most processors with FP support
 # IEEE FP.  On those that don't support FP at all, usually IEEE
 # is emulated.