diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ddec5930c5..885715e2c4 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-10  Philip Blundell  <pb@futuretv.com>
+
+	* config.bfd (arm*-*-linux-gnu*): Match instead of arm*-*-linux-gnu.
+	(arm*-*-conix*): New target.
+
 2000-01-10  Egor Duda  <deo@logos-m.ru>
 
 	* config.bfd: Include elf32_i386 vector to target list for cygwin 
diff --git a/bfd/config.bfd b/bfd/config.bfd
index e844bf1d68..fb7321fba0 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -115,7 +115,7 @@ case "${targ}" in
     targ_selvecs=armcoff_big_vec
     targ_underscore=yes
     ;;
-  arm-*-elf | arm*-*-linux-gnu)
+  arm-*-elf | arm*-*-linux-gnu* | arm*-*-conix*)
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9e737058ca..ffec330c13 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2000-01-10  Philip Blundell  <pb@futuretv.com>
+
+	* configure.in (arm*-*-conix*): New target.
+	(arm*-*-linux-gnu*): Match instead of arm-*-linux* and
+	armv*-*-linux-gnu.
+	* configure: Regenerate.
+
 2000-01-03  Martin v. Loewis  <loewis@informatik.hu-berlin.de>
 
 	* config/obj-elf.c (elf_pseudo_table): Define visibility pseudos.
diff --git a/gas/configure b/gas/configure
index 06c44f3579..82c0da4f58 100755
--- a/gas/configure
+++ b/gas/configure
@@ -2032,8 +2032,9 @@ for this_target in $target $canon_targets ; do
       arm-*-aout)	                fmt=aout ;;
       arm-*-coff | thumb-*-coff)        fmt=coff ;;
       arm-*-elf | thumb-*-elf)          fmt=elf ;;
+      arm*-*-conix*)			fmt=elf ;;
       arm-*-linux*aout*)	        fmt=aout em=linux ;;
-      arm-*-linux* | armv*-*-linux-gnu)	fmt=elf  em=linux ;;
+      arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
       arm-*-netbsd*)	                fmt=aout em=nbsd bfd_gas=yes ;;
       arm-*-oabi | thumb-*-oabi)        fmt=elf ;;
       arm-epoc-pe | thumb-epoc-pe)      fmt=coff em=epoc-pe ;;
diff --git a/gas/configure.in b/gas/configure.in
index 697211a0bf..9260f148a2 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -149,8 +149,9 @@ changequote([,])dnl
       arm-*-aout)	                fmt=aout ;;
       arm-*-coff | thumb-*-coff)        fmt=coff ;;
       arm-*-elf | thumb-*-elf)          fmt=elf ;;
+      arm*-*-conix*)			fmt=elf ;;
       arm-*-linux*aout*)	        fmt=aout em=linux ;;
-      arm-*-linux* | armv*-*-linux-gnu)	fmt=elf  em=linux ;;
+      arm*-*-linux-gnu*)		fmt=elf  em=linux ;;
       arm-*-netbsd*)	                fmt=aout em=nbsd bfd_gas=yes ;;
       arm-*-oabi | thumb-*-oabi)        fmt=elf ;;
       arm-epoc-pe | thumb-epoc-pe)      fmt=coff em=epoc-pe ;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index a51801812b..4b8107f623 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2000-01-10  Philip Blundell  <pb@futuretv.com>
+
+	* configure.tgt (arm*-*-conix*): New target.
+
 2000-01-07  Nick Clifton  <nickc@cygnus.com>
 
 	* ld.texinfo (Options): Remind users to preceed linker command
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 9289ca9a96..0ef296e3c3 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -133,6 +133,7 @@ arm-*-elf)		targ_emul=armelf ;;
 arm-*-oabi)		targ_emul=armelf_oabi ;;
 arm*-*-linux-gnu*)	targ_emul=armelf_linux; targ_extra_emuls="armelf_linux26 armelf" ;;
 arm*-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
+arm*-*-conix*)		targ_emul=armelf ;;
 thumb-*-linux-gnu* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
 strongarm-*-coff)	targ_emul=armcoff ;;
 strongarm-*-elf)	targ_emul=armelf ;;