diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0e22b0f028..febc8f06b7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* amd64fbsd-nat.c (_initialize_amd64fbsd_nat): Rename from
+	_initialize_am64fbsd_nat.
+
 2003-09-15  Kevin Buettner  <kevinb@redhat.com>
 
 	* dwarf2read.c (dwarf2_get_pc_bounds): Complain if offset
@@ -59,6 +64,14 @@
 
 2003-09-14  Mark Kettenis  <kettenis@gnu.org>
 
+	* gdbarch.sh (DEPRECATED_REG_STRUCT_HAS_ADDR): Add comment.
+	(stabs_argument_has_addr): New architecture method.
+	* arch-utils.h (default_stabs_argument_has_addr): New prototype.
+	* arch-utils.c: Include "buildsym.h".
+	(default_stabs_argument_has_addr): New function.
+	* stabsread.c (define_symbol): Use stabs_argument_has_addr
+	instead of DEPRECATED_REG_STRUCT_HAS_ADDR.
+
 	* cris-tdep.c (cris_gdbarch_init): Set
 	deprecated_reg_struct_has_addr instead of reg_struct_has_addr.
 	* hppa-tdep.c (hppa_gdbarch_init): Likewise.
diff --git a/gdb/amd64fbsd-nat.c b/gdb/amd64fbsd-nat.c
index dee2c8dea1..de13f188ff 100644
--- a/gdb/amd64fbsd-nat.c
+++ b/gdb/amd64fbsd-nat.c
@@ -218,7 +218,7 @@ store_inferior_registers (int regnum)
 void _initialize_amd64fbsd_nat (void);
 
 void
-_initialize_am64fbsd_nat (void)
+_initialize_amd64fbsd_nat (void)
 {
   int offset;