diff --git a/ChangeLog b/ChangeLog
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 49b969acf..8b93fae8e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-15  Michael Meeks  <michael@ximian.com>
+
+	* glib/giounix.c (g_io_channel_unix_new): set the fd
+	before using it.
+
 2001-11-15  Tor Lillqvist  <tml@iki.fi>
 
 	* tests/makefile.{mingw,msc}.in (TESTS): Add back mainloop-test
diff --git a/glib/giounix.c b/glib/giounix.c
index c2db911a8..34ba4e9b4 100644
--- a/glib/giounix.c
+++ b/glib/giounix.c
@@ -556,6 +556,8 @@ g_io_channel_unix_new (gint fd)
   g_io_channel_init (channel);
   channel->funcs = &unix_channel_funcs;
 
+  unix_channel->fd = fd;
+
   /* I'm not sure if fstat on a non-file (e.g., socket) works
    * it should be safe to say if it fails, the fd isn't seekable.
    */
@@ -568,8 +570,6 @@ g_io_channel_unix_new (gint fd)
   else /* Assume not seekable */
     channel->is_seekable = FALSE;
 
-  unix_channel->fd = fd;
-
   g_io_unix_get_flags (channel); /* Sets is_readable, is_writeable */
 
   return channel;