diff --git a/ChangeLog b/ChangeLog
index 5666a1dad..3454b9333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-06  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSScanner.m: ([scanHexInt:]) fix for scanning number
+	consisting just of a zero.  Reported by Tom Koelman
+
 2001-06-06  Richard Frith-Macdonald <rfm@gnu.org>
 
 	Changes for constant string support with gcc-3.0
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index d70e56f3d..1e97ad9dd 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -435,13 +435,17 @@ typedef struct {
 	    {
 	      case 'x': 
 	      case 'X': 
-		_scanLocation++;
+		_scanLocation++;	// Scan beyond the 0x prefix
 		break;
 	      default:
-		_scanLocation--;
+		_scanLocation--;	// Scan from the initial digit
 	        break;
 	    }
 	}
+      else
+	{
+	  _scanLocation--;	// Just scan the zero.
+	}
     }
   if ([self scanUnsignedInt_: value radix: 16 gotDigits: NO])
     return YES;