diff --git a/ChangeLog b/ChangeLog
index b0d253f02..0a9ecb86f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-10  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gstdio.c (g_rename): Initialize save_errno.
+	(#355206, Mike Edenfield)
+
 2006-09-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gerror.c: Allocate GErrors using the slice allocator.
diff --git a/glib/gstdio.c b/glib/gstdio.c
index 969485654..a9dc98b99 100644
--- a/glib/gstdio.c
+++ b/glib/gstdio.c
@@ -261,7 +261,7 @@ g_rename (const gchar *oldfilename,
   wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL);
   wchar_t *wnewfilename;
   int retval;
-  int save_errno;
+  int save_errno = 0;
 
   if (woldfilename == NULL)
     {