diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a26ea4143..1719c18939 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -6,6 +6,9 @@
 
 2011-03-03  Michael Snyder  <msnyder@vmware.com>
 
+	* remote-fileio.c (remote_fileio_func_fstat): Initialize all
+	fields of struct 'st' to zero.
+
 	* tui/tui-winsource.c (tui_update_source_window_as_is): Initialize
 	sal.pspace before calling set_current_source_symtab_and_line.
 
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 38d7c7cc32..7338b97fb9 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -1173,20 +1173,15 @@ remote_fileio_func_fstat (char *buf)
   if (fd == FIO_FD_CONSOLE_IN || fd == FIO_FD_CONSOLE_OUT)
     {
       remote_fileio_to_fio_uint (1, fst.fst_dev);
+      memset (&st, 0, sizeof (st));
       st.st_mode = S_IFCHR | (fd == FIO_FD_CONSOLE_IN ? S_IRUSR : S_IWUSR);
       st.st_nlink = 1;
 #ifdef HAVE_GETUID
       st.st_uid = getuid ();
-#else
-      st.st_uid = 0;
 #endif
 #ifdef HAVE_GETGID
       st.st_gid = getgid ();
-#else
-      st.st_gid = 0;
 #endif
-      st.st_rdev = 0;
-      st.st_size = 0;
 #ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
       st.st_blksize = 512;
 #endif