diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 2181efb0111..f77fbcaa49c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-23  Doug Evans  <dje@google.com>
+
+	* server.c (start_inferior): Print inferior argv if --debug.
+
 2010-04-21  Aleksandar Ristovski  <aristovski@qnx.com>
 
 	* Makefile.in (nto_low_h nto-low.o nto-x86-low.o): New dependency lists.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 9c05c7fcc53..35ea802ea51 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -241,6 +241,14 @@ start_inferior (char **argv)
       new_argv[count] = NULL;
     }
 
+  if (debug_threads)
+    {
+      int i;
+      for (i = 0; new_argv[i]; ++i)
+	fprintf (stderr, "new_argv[%d] = \"%s\"\n", i, new_argv[i]);
+      fflush (stderr);
+    }
+
 #ifdef SIGTTOU
   signal (SIGTTOU, SIG_DFL);
   signal (SIGTTIN, SIG_DFL);