diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index a2329be759..4780f0a2a6 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-22  Alexandre Oliva  <aoliva@cygnus.com>
+
+	* armemu.c (MultiplyAdd64): Fix computation of flag N.
+
 2000-06-20  Alexandre Oliva  <aoliva@cygnus.com>
 
 	* armemu.h (NEGBRANCH): Do not overwrite the two most significant
diff --git a/sim/arm/armemu.c b/sim/arm/armemu.c
index acbcb75295..426617d6bb 100644
--- a/sim/arm/armemu.c
+++ b/sim/arm/armemu.c
@@ -3871,10 +3871,9 @@ MultiplyAdd64 (ARMul_State * state, ARMword instr, int msigned, int scc)
 
   if (scc)
     {
-      if ((RdHi == 0) && (RdLo == 0))
-	ARMul_NegZero (state, RdHi);	/* zero value */
-      else
-	ARMul_NegZero (state, scc);	/* non-zero value */
+      /* Ensure that both RdHi and RdLo are used to compute Z, but
+	 don't let RdLo's sign bit make it to N.  */
+      ARMul_NegZero (state, RdHi | (RdLo >> 16) | (RdLo & 0xFFFF));
     }
 
   return scount + 1;		/* extra cycle for addition */