diff --git a/gdb/command.c b/gdb/command.c
index f2af0d5aa1..8a3419c6a4 100644
--- a/gdb/command.c
+++ b/gdb/command.c
@@ -1281,10 +1281,10 @@ show_user_1 (c, stream)
   fputs_filtered ("User command ", stream);
   fputs_filtered (c->name, stream);
   fputs_filtered (":\n", stream);
+
   while (cmdlines)
     {
-      fputs_filtered (cmdlines->line, stream); 
-      fputs_filtered ("\n", stream); 
+      print_command_line (cmdlines, 4);
       cmdlines = cmdlines->next;
     }
   fputs_filtered ("\n", stream);
diff --git a/gdb/top.c b/gdb/top.c
index 0c8bae3270..acc2066264 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -3394,7 +3394,7 @@ End with a line of just \"end\".");
 Definition appears on following lines, one command per line.\n\
 End with a line of just \"end\".\n\
 Use the \"document\" command to give documentation for the new command.\n\
-Commands defined in this way do not take arguments.");
+Commands defined in this way may have up to ten arguments.");
 
 #ifdef __STDC__
   c = add_cmd ("source", class_support, source_command,