diff --git a/ChangeLog b/ChangeLog
index 2b0dc0e7e..89108f309 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-04-07 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* configure.ac: Fix for bug #29291 based on suggestion by Niels Grewe
+	* Source/GSFileHandle.m: Fix possible descriptor leak.
 
 2010-04-06  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
diff --git a/Source/GSFileHandle.m b/Source/GSFileHandle.m
index baa86d577..002b87edb 100644
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@@ -1077,7 +1077,14 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
 - (id) initWithFileDescriptor: (int)desc closeOnDealloc: (BOOL)flag
 {
   self = [super init];
-  if (self != nil)
+  if (nil == self)
+    {
+      if (YES == flag)
+	{
+	  close(desc);
+	}
+    }
+  else
     {
       struct stat	sbuf;
       int		e;