diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc3464a895..32a404d40f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-17  Ben Harris  <bjh21@netbsd.org>
+
+	* armbsd-nat.c: Remove file, renamed to armnbsd-nat.c.
+	* armnbsd-nat.c: New file, renamed from armbsd-nat.c.
+	* Makefile.in: Rename armbsd-nat.c to armnbsd-nat.c.
+	* config/arm/nbsd.mh: Likewise.
+
 2001-12-17  Corinna Vinschen  <vinschen@redhat.com>
 
 	* NEWS: Note new target XStormy16.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d0768ec55d..f4bd4cb51c 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1177,7 +1177,7 @@ unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET :
 ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
 	29k-share/udi/udi2go32.c \
 	a29k-tdep.c a68v-nat.c alpha-nat.c alpha-tdep.c \
-	arm-linux-nat.c arm-linux-tdep.c arm-tdep.c armbsd-nat.c \
+	arm-linux-nat.c arm-linux-tdep.c arm-tdep.c armnbsd-nat.c \
 	coff-solib.c \
 	core-sol2.c core-regset.c core-aout.c corelow.c \
 	dcache.c delta68-nat.c dpx2-nat.c dstread.c exec.c fork-child.c \
@@ -1258,7 +1258,7 @@ arm-linux-tdep.o: arm-linux-tdep.c $(defs_h) $(target_h) $(value_h) \
 arm-tdep.o: arm-tdep.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h) \
 	$(gdbcore_h) $(regcache_h) $(doublest_h) $(value_h)
 
-armbsd-nat.o: armbsd-nat.c $(defs_h)
+armnbsd-nat.o: armnbsd-nat.c $(defs_h)
 
 bcache.o: bcache.c $(bcache_h) $(defs_h)
 
diff --git a/gdb/armbsd-nat.c b/gdb/armnbsd-nat.c
similarity index 100%
rename from gdb/armbsd-nat.c
rename to gdb/armnbsd-nat.c
diff --git a/gdb/config/arm/nbsd.mh b/gdb/config/arm/nbsd.mh
index 9842261cc6..2130d9db66 100644
--- a/gdb/config/arm/nbsd.mh
+++ b/gdb/config/arm/nbsd.mh
@@ -1,5 +1,5 @@
 # Host ARM running NetBSD
 XDEPFILES= ser-tcp.o
-NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armbsd-nat.o
+NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o armnbsd-nat.o
 XM_FILE=xm-nbsd.h
 NAT_FILE=nm-nbsd.h