diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28c73bd57c2..1b94c4b64bc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-04  Paul Brook  <paul@codesourcery.com>
+
+	* configure.tgt: Loosen checks for arm uclinux eabi targets.
+
 2007-04-02  Sterling Augustine  <sterling@tensilica.com>
 
 	* config/tc-xtensa.c (xtensa_flush_pending_output): Check
diff --git a/gas/configure.tgt b/gas/configure.tgt
index e5081d060cf..c77cf8188dd 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -113,7 +113,7 @@ case ${generic_target} in
   arm-*-linux*aout*)			fmt=aout em=linux ;;
   arm-*-linux-*eabi*)			fmt=elf  em=armlinuxeabi ;;
   arm-*-linux-*)			fmt=elf  em=linux ;;
-  arm-*-uclinux-*eabi*)			fmt=elf  em=armlinuxeabi ;;
+  arm-*-uclinux*eabi*)			fmt=elf  em=armlinuxeabi ;;
   arm-*-uclinux*)			fmt=elf  em=linux ;;
   arm-*-netbsdelf*)                 	fmt=elf  em=nbsd ;;
   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f023c0b7f60..a838c149449 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-04  Paul Brook  <paul@codesourcery.com>
+
+	* configure.tgt: Loosen checks for arm uclinux eabi targets.
+
 2007-04-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/4090
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 9a25a973bff..80383cf42a7 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -83,7 +83,7 @@ arm*-*-linux-*)	        targ_emul=armelf_linux
 			targ_extra_emuls="armelf armelfb armelfb_linux"
 			targ_extra_libpath="armelfb_linux"
 			;;
-arm*-*-uclinux-*eabi)	targ_emul=armelf_linux_eabi
+arm*-*-uclinux*eabi)	targ_emul=armelf_linux_eabi
 			targ_extra_emuls=armelfb_linux_eabi
 			targ_extra_libpath=$targ_extra_emuls
 			;;