diff --git a/ChangeLog b/ChangeLog
index 8cf1b2f6b..f020cdbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-24  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* Source/GSFileHandle.m (-initWithStandardError,
+	-initWithStandardInput, -initWithStandardOutput): Restore lost
+	assignments which ensure that only one file handle exists for each
+	of the standard channels. This fixes a bug where a run loop might
+	unexpectedly stop watching the standard channels.
+
 2010-08-23  Riccardo Mottola (patch by Yavor Doganov)
 
 	* configure.ac: Include pthread.h in check program
diff --git a/Source/GSFileHandle.m b/Source/GSFileHandle.m
index 1fca93e92..a54d049c8 100644
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@@ -1022,6 +1022,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
   else
     {
       self = [self initWithFileDescriptor: 2 closeOnDealloc: NO];
+      fh_stderr = self;
     }
   if (self)
     {
@@ -1039,6 +1040,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
   else
     {
       self = [self initWithFileDescriptor: 0 closeOnDealloc: NO];
+      fh_stdin = self;
     }
   if (self)
     {
@@ -1056,6 +1058,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
   else
     {
       self = [self initWithFileDescriptor: 1 closeOnDealloc: NO];
+      fh_stdout = self;
     }
   if (self)
     {