diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9b352e0dd3..2a51386ae9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-07  Joel Brobecker  <brobecker@adacore.com>
+
+	* symfile.c (add_symbol_file_command): Abort if the user forgot
+	to provide the address when the file has been loaded.
+
 2006-02-07  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* MAINTAINERS: Update file based on maintainers survey.  Add
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 93cb009e4f..e63ee53053 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -1876,6 +1876,13 @@ add_symbol_file_command (char *args, int from_tty)
       argcnt++;
     }
 
+  /* This command takes at least two arguments.  The first one is a
+     filename, and the second is the address where this file has been
+     loaded.  Abort now if this address hasn't been provided by the
+     user.  */
+  if (section_index < 1)
+    error (_("The address where %s has been loaded is missing"), filename);
+
   /* Print the prompt for the query below. And save the arguments into
      a sect_addr_info structure to be passed around to other
      functions.  We have to split this up into separate print