diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f90ef2e0ef..a05058c1833 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2008-02-02  Doug Evans  <dje@google.com>
 
+	* valarith.c (value_binop): Handle unsigned BINOP_REM division by zero.
+
 	* typeprint.c (*): Whitespace cleanup.
 
 2008-02-02  Mark Kettenis  <kettenis@gnu.org>
diff --git a/gdb/valarith.c b/gdb/valarith.c
index e69aaa67567..62059122c07 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -1116,7 +1116,10 @@ value_binop (struct value *arg1, struct value *arg2, enum exp_opcode op)
 	      break;
 
 	    case BINOP_REM:
-	      v = v1 % v2;
+	      if (v2 != 0)
+		v = v1 % v2;
+	      else
+		error (_("Division by zero"));
 	      break;
 
 	    case BINOP_MOD: