diff --git a/ChangeLog b/ChangeLog
index e4fee36b6..45b757dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSHTTPURLHandle.m: Remove self as observer of socket
+	while ssl connection is in progress.
+
 2008-02-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSArray.m: Minor optimisation ...use a subarray when
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index d496d4d63..8f0a0cf36 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -984,9 +984,11 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
     }
   if ([[u scheme] isEqualToString: @"https"])
     {
-      /*
-       * If we are an https connection, negotiate secure connection
+      /* If we are an https connection, negotiate secure connection.
+       * Make sure we are not an observer of the file handle while
+       * it is connecting...
        */
+      [nc removeObserver: self name: nil object: sock];
       if ([sock sslConnect] == NO)
 	{
 	  [self endLoadInBackground];