diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3a2d00dab76..113cf11d30d7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-25  Uros Bizjak  <ubizjak@gmail.com>
+
+	PR target/39897
+	* config/i386/i386.c (print_operand) ['z']: Revert handling of
+	HImode operands.
+
 2009-04-25  Joseph Myers  <joseph@codesourcery.com>
 
 	PR c/39564
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 65ee05c81b52..67a4efc04b75 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -10996,7 +10996,17 @@ print_operand (FILE *file, rtx x, int code)
 	      return;
 
 	    case 2:
-	      putc ('w', file);
+	      /* ??? This fails for HImode integer
+		 operator with memory operand.  */
+	      if (MEM_P (x))
+		{
+#ifdef HAVE_AS_IX86_FISTS
+		  putc ('s', file);
+#endif
+		  return;
+		}
+	      else
+		putc ('w', file);
 	      return;
 
 	    case 4: