diff --git a/ChangeLog b/ChangeLog
index c86ae09e4..ac94a8c1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/Source/NSNumber.m: Implement ([isEqualToValue:])
+
 2007-06-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSURLHandle.m: ([loadInForeground]) return as soon as load
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 0e3cd9f8e..2e9c6531c 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -382,8 +382,10 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
 
 + (BOOL) canInitWithURL: (NSURL*)newUrl
 {
-  if ([[newUrl scheme] isEqualToString: @"http"]
-    || [[newUrl scheme] isEqualToString: @"https"])
+  NSString      *scheme = [newUrl scheme];
+
+  if ([scheme isEqualToString: @"http"]
+    || [scheme isEqualToString: @"https"])
     {
       return YES;
     }
diff --git a/Source/NSNumber.m b/Source/NSNumber.m
index 9ea1b6f50..0545fdef1 100644
--- a/Source/NSNumber.m
+++ b/Source/NSNumber.m
@@ -2429,6 +2429,24 @@ static Class	doubleNumberClass;
   return NO;
 }
 
+- (BOOL) isEqualToValue: (NSValue*)o
+{
+  if (o == self)
+    {
+      return YES;
+    }
+  else if (o == nil)
+    {
+      return NO;
+    }
+  else if (GSObjCIsInstance(o) == YES
+    && GSObjCIsKindOf(GSObjCClass(o), abstractClass))
+    {
+      return [self isEqualToNumber: (NSNumber*)o];
+    }
+  return NO;
+}
+
 /*
  * NSCoding
  */