diff --git a/ChangeLog b/ChangeLog
index 67217160c..4ef62761c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-04  David Ayers  <ayers@fsfe.org>
+
+	* Source/GSHTTPURLHandle.m (writeKeyCallBacks): Use retained
+	callbacks for keys.
+	
 2007-08-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSProcessInfo.m: Private method to check existence of
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 2e9c6531c..c3fbac19f 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -68,13 +68,13 @@
  * captialisation of headers (some http software is faulty like that).
  */
 static unsigned int
-_non_retained_id_hash(void *table, NSString* o)
+_id_hash(void *table, NSString* o)
 {
   return [[o uppercaseString] hash];
 }
 
 static BOOL
-_non_retained_id_is_equal(void *table, NSString *o, NSString *p)
+_id_is_equal(void *table, NSString *o, NSString *p)
 {
   return ([o caseInsensitiveCompare: p] == NSOrderedSame) ? YES : NO;
 }
@@ -87,11 +87,11 @@ typedef NSString *(*NSMT_describe_func_t)(NSMapTable *, const void *);
 
 static const NSMapTableKeyCallBacks writeKeyCallBacks =
 {
-  (NSMT_hash_func_t) _non_retained_id_hash,
-  (NSMT_is_equal_func_t) _non_retained_id_is_equal,
-  (NSMT_retain_func_t) _NS_non_retained_id_retain,
-  (NSMT_release_func_t) _NS_non_retained_id_release,
-  (NSMT_describe_func_t) _NS_non_retained_id_describe,
+  (NSMT_hash_func_t) _id_hash,
+  (NSMT_is_equal_func_t) _id_is_equal,
+  (NSMT_retain_func_t) _NS_id_retain,
+  (NSMT_release_func_t) _NS_id_release,
+  (NSMT_describe_func_t) _NS_id_describe,
   NSNotAPointerMapKey
 };