diff --git a/gdb/gdbserver/.Sanitize b/gdb/gdbserver/.Sanitize
index 21b2f62537..7bd7aca5ac 100644
--- a/gdb/gdbserver/.Sanitize
+++ b/gdb/gdbserver/.Sanitize
@@ -26,6 +26,7 @@ Things-to-keep:
 Makefile.in
 README
 configure.in
+gdbserver.1
 low-lynx.c
 low-sparc.c
 low-sun3.c
diff --git a/gdb/gdbserver/configure.in b/gdb/gdbserver/configure.in
index 7b59ce07e5..c9aee22ade 100644
--- a/gdb/gdbserver/configure.in
+++ b/gdb/gdbserver/configure.in
@@ -45,7 +45,7 @@ i[34]86-ncr-*)		gdb_host=ncr3000 ;;
 i[34]86-sequent-*)	gdb_host=symmetry ;;
 
 i[34]86-*-bsd*)		gdb_host=i386bsd ;;
-i[34]86-*-lynx*)	gdb_host=i386lynx ;;
+i[34]86-*-lynxos*)	gdb_host=i386lynx ;;
 i[34]86-*-go32)		gdb_host=go32
 			gdb_serial_driver=ser-go32.c
 			;;
@@ -71,6 +71,7 @@ m68*-cbm-sysv4*)	gdb_host=amix ;;
 m68*-hp-bsd*)		gdb_host=hp300bsd ;;
 m68*-hp-hpux*)		gdb_host=hp300hpux ;;
 m68*-isi-*)		gdb_host=isi ;;
+m68*-*-lynxos*)		gdb_host=m68klynx ;;
 m68*-sony-*)		gdb_host=news ;;
 m68*-sun-sunos3*)	gdb_host=sun3os3 ;;
 m68*-sun-sunos4*)	gdb_host=sun3os4 ;;
@@ -100,6 +101,7 @@ romp-*-*)		gdb_host=rtbsd ;;
 
 rs6000-*-*)		gdb_host=rs6000 ;;
 
+sparc-*-lynxos*)	gdb_host=sparclynx ;;
 sparc-*-solaris2*)	gdb_host=sun4sol2 ;;
 sparc-*-sunos4*)	gdb_host=sun4os4 ;;
 sparc-*-*)		gdb_host=sun4os4 ;;
@@ -173,7 +175,7 @@ i[34]86-*-coff)		gdb_target=i386v ;;
 i[34]86-*-elf)		gdb_target=i386v ;;
 
 i[34]86-*-bsd*)		gdb_target=i386bsd ;;
-i[34]86-*-lynx*)	gdb_target=i386lynx ;;
+i[34]86-*-lynxos*)	gdb_target=i386lynx ;;
 i[34]86-*-go32)		gdb_target=i386aout ;;
 i[34]86-*-solaris*)	gdb_target=i386sol2 ;;
 i[34]86-*-sunos*)	gdb_target=sun386 ;;
@@ -210,6 +212,7 @@ m68*-tandem-*)		gdb_target=st2000 ;;
 m68*-*-aout)		gdb_target=m68k-fp ;;
 m68*-*-coff)		gdb_target=m68k-fp ;;
 m68*-*-elf)		gdb_target=m68k-fp ;;
+m68*-*-lynxos*)		gdb_target=m68klynx ;;
 m68*-*-os68k)		gdb_target=os68k ;;
 m68*-*-sunos3*)		gdb_target=sun3os3 ;;
 m68*-*-sunos4*)		gdb_target=sun3os4 ;;
@@ -241,6 +244,7 @@ rs6000-*-*)		gdb_target=rs6000 ;;
 sparc-*-aout)		gdb_target=sparc-em ;;
 sparc-*-coff)		gdb_target=sparc-em ;;
 sparc-*-elf)		gdb_target=sparc-em ;;
+sparc-*-lynxos*)	gdb_target=sparclynx ;;
 sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
 sparc-*-sunos4*)	gdb_target=sun4os4 ;;
 sparc-*-vxworks*)	gdb_target=sparc-em ;;