diff --git a/gio/ChangeLog b/gio/ChangeLog
index a7cb45fad..03a8f82d8 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,13 +1,21 @@
+2008-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 541715 – win32 : patch for warnings and signature problems in 
+	recent code
+	
+	* glocalvfs.c: Avoid unused variables. Pointed out by Jody
+	Goldberg.
+
 2008-11-28  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 562393 – g_buffered_input_stream_read_byte broken if data
 	available
 
-	* gio/gbufferedinputstream.c (g_buffered_input_stream_read_byte): Fix
+	* gbufferedinputstream.c (g_buffered_input_stream_read_byte): Fix
 	handling of buffered content.  Patch by Philip Withnall
 
-	* gio/tests/buffered-input-stream.c: Add a testcase for this bug.
-	* gio/tests/Makefile.am: And build it
+	* tests/buffered-input-stream.c: Add a testcase for this bug.
+	* tests/Makefile.am: And build it
 
 2008-11-28  Matthias Clasen  <mclasen@redhat.com>
 
diff --git a/gio/glocalvfs.c b/gio/glocalvfs.c
index 42a3f16fa..2ec07eb82 100644
--- a/gio/glocalvfs.c
+++ b/gio/glocalvfs.c
@@ -115,11 +115,13 @@ g_local_vfs_parse_name (GVfs       *vfs,
 {
   GFile *file;
   char *filename;
-  char *user_name;
   char *user_prefix;
   const char *user_start, *user_end;
   char *rest;
+#ifdef HAVE_PWD_H
   struct passwd *passwd_file_entry;
+  char *user_name;
+#endif
   
   g_return_val_if_fail (G_IS_VFS (vfs), NULL);
   g_return_val_if_fail (parse_name != NULL, NULL);