diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6558c7cd89e..d69d4e28318 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-26  Maciej W. Rozycki  <macro@mips.com>
+
+	* configure.tgt: Use generic emulation for `mips-*-windiss',
+	overriding the blanket choice made for `*-*-windiss'.
+
 2018-01-26  Maciej W. Rozycki  <macro@mips.com>
 
 	* configure.tgt: Use `mips-*-sysv4*' rather than
diff --git a/gas/configure.tgt b/gas/configure.tgt
index 12bd9b2e2ca..6455fbbb79b 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -351,6 +351,7 @@ case ${generic_target} in
   mips-*-elf*)				fmt=elf ;;
   mips-*-netbsd*)			fmt=elf em=tmips ;;
   mips-*-openbsd*)			fmt=elf em=tmips ;;
+  mips-*-windiss)			fmt=elf ;;
 
   mmix-*-*)				fmt=elf ;;