diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 861f5b8743c..15bf0c80e65 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* dwarf2read.c: Include completer.h.
+	(save_gdb_index_command): Use matching usage command name.
+	(_initialize_dwarf2_read): New variable c, initialize it by add_cmd.
+	Set filename_completer for it.
+
 2010-07-22  Tom Tromey  <tromey@redhat.com>
 
 	* dwarf2read.c (create_debug_types_hash_table): Set objfile on
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 3a24e9ff859..0d63fe32877 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -53,6 +53,7 @@
 #include "psympriv.h"
 #include "exceptions.h"
 #include "gdb_stat.h"
+#include "completer.h"
 
 #include <fcntl.h>
 #include "gdb_string.h"
@@ -14135,7 +14136,7 @@ save_gdb_index_command (char *arg, int from_tty)
   struct objfile *objfile;
 
   if (!arg || !*arg)
-    error (_("usage: maintenance save-gdb-index DIRECTORY"));
+    error (_("usage: save gdb-index DIRECTORY"));
 
   ALL_OBJFILES (objfile)
   {
@@ -14180,6 +14181,8 @@ void _initialize_dwarf2_read (void);
 void
 _initialize_dwarf2_read (void)
 {
+  struct cmd_list_element *c;
+
   dwarf2_objfile_data_key
     = register_objfile_data_with_cleanup (NULL, dwarf2_per_objfile_free);
 
@@ -14228,7 +14231,8 @@ The value is the maximum depth to print."),
 			    NULL,
 			    &setdebuglist, &showdebuglist);
 
-  add_cmd ("gdb-index", class_files, save_gdb_index_command,
-	   _("Save a .gdb-index file"),
-	   &save_cmdlist);
+  c = add_cmd ("gdb-index", class_files, save_gdb_index_command,
+	       _("Save a .gdb-index file"),
+	       &save_cmdlist);
+  set_cmd_completer (c, filename_completer);
 }