diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ecd21247200..4f5138932b1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-12-13  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* configure.tgt: Match msp430-*-elf* targets when configuring GDB.
+
 2019-12-12  Tom Tromey  <tom@tromey.com>
 
 	* objfiles.h (struct objfile) <partial_symtabs>: Now a
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index b3717c7a80c..ab4c098c0da 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -454,7 +454,7 @@ mn10300-*-*)
 	gdb_sim=../sim/mn10300/libsim.a
 	;;
 
-msp430*-*-elf)
+msp430-*-elf*)
 	gdb_target_obs="msp430-tdep.o"
 	gdb_sim=../sim/msp430/libsim.a
 	;;