diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3652bd2099..4cd5bde6aa 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* remote.c (unpack_varlen_hex): Correct type of retval.
+	Reported by Zhigang Gong <zhigang.gong@gmail.com>.
+
 2006-07-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* dwarf2read.c (dwarf2_symbol_mark_computed): Handle corrupted
diff --git a/gdb/remote.c b/gdb/remote.c
index 687a5d8f7e..7b4f55bef7 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -1188,7 +1188,7 @@ unpack_varlen_hex (char *buff,	/* packet to parse */
 		   ULONGEST *result)
 {
   int nibble;
-  int retval = 0;
+  ULONGEST retval = 0;
 
   while (ishex (*buff, &nibble))
     {