diff --git a/ld/ChangeLog b/ld/ChangeLog
index 026ee08cb0..32ed5d7efa 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-05  Hans-Peter Nilsson  <hp@axis.com>
+
+	* configure.tgt (mips64*el-*-freebsd*, mips64*-*-freebsd*)
+	(mips*el-*-freebsd*, mips*-*-freebsd*): Correct triplets by
+	replacing trailing "-*" with "*".
+
 2012-02-25  Walter Lee  <walt@tilera.com>
 
 	* Makefile.am (ALL_EMULATION_SOURCES): Add eelf32tilegx_be.c.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index f5f7e92e60..8cd2915de4 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -409,19 +409,19 @@ mips*el-*-linux-*)	targ_emul=elf32ltsmip
 mips*-*-linux-*)	targ_emul=elf32btsmip
 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips64*el-*-freebsd-* | mips64*el-*-kfreebsd*-gnu)
+mips64*el-*-freebsd* | mips64*el-*-kfreebsd*-gnu)
 			targ_emul=elf32ltsmipn32_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips64*-*-freebsd-* | mips64*-*-kfreebsd*-gnu)
+mips64*-*-freebsd* | mips64*-*-kfreebsd*-gnu)
 			targ_emul=elf32btsmipn32_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmip_fbsd elf32ltsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips*el-*-freebsd-* | mips*el-*-kfreebsd*-gnu)
+mips*el-*-freebsd* | mips*el-*-kfreebsd*-gnu)
 			targ_emul=elf32ltsmip_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmipn32_fbsd elf32btsmip_fbsd elf32btsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;
-mips*-*-freebsd-* | mips*-*-kfreebsd*-gnu)
+mips*-*-freebsd* | mips*-*-kfreebsd*-gnu)
 			targ_emul=elf32btsmip_fbsd
 			targ_extra_emuls="elf32ltsmip elf32btsmip elf32ltsmipn32 elf32btsmipn32 elf64ltsmip elf64btsmip elf32ltsmip_fbsd elf32btsmipn32_fbsd elf32ltsmipn32_fbsd elf64ltsmip_fbsd elf64btsmip_fbsd"
 			targ_extra_libpath=$targ_extra_emuls ;;