diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7330f54caa..71bfb8afcf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-24  Orjan Friberg  <orjanf@axis.com>
+
+	* config/djgpp/fnchange.lst: Add mappings for 
+	gdbserver/linux-cris-low.c and gdbserver/linux-crisv32-low.c.
+
 2005-05-23  Michael Snyder  <msnyder@redhat.com>
 	From Nora Pan <qpan@mvista.com>
 	* linux-nat.c (read_mapping): Don't stumble over entries in
diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst
index 7be2f88e55..37722810da 100644
--- a/gdb/config/djgpp/fnchange.lst
+++ b/gdb/config/djgpp/fnchange.lst
@@ -108,6 +108,8 @@
 @V@/gdb/config/sparc/tm-sparclynx.h @V@/gdb/config/sparc/tm-splynx.h
 @V@/gdb/cp-names.c @V@/gdb/cpnames.c
 @V@/gdb/f-exp.tab.c @V@/gdb/f-exp_tab.c
+@V@/gdb/gdbserver/linux-cris-low.c @V@/gdb/gdbserver/lx-cris.c
+@V@/gdb/gdbserver/linux-crisv32-low.c @V@/gdb/gdbserver/lx-cris32.c
 @V@/gdb/gdbtk/ChangeLog-2001 @V@/gdb/gdbtk/ChangeLog.001
 @V@/gdb/gdbtk/ChangeLog-2002 @V@/gdb/gdbtk/ChangeLog.002
 @V@/gdb/gdbtk/ChangeLog-2003 @V@/gdb/gdbtk/ChangeLog.003