diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index eef126992..9879c0458 100644
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -48,17 +48,18 @@ if { [info exists BSTAPID ] } {
   set _BSTAPID2 0x06410041
   # Medium density devices, Rev B and Rev Z
   set _BSTAPID3 0x16410041
+  set _BSTAPID4 0x06420041
   # High density devices, Rev A
-  set _BSTAPID4 0x06414041
+  set _BSTAPID5 0x06414041
   # Connectivity line devices, Rev A and Rev Z
-  set _BSTAPID5 0x06418041
+  set _BSTAPID6 0x06418041
   # XL line devices, Rev A
-  set _BSTAPID6 0x06430041
+  set _BSTAPID7 0x06430041
 }
 jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
 	-expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
 	-expected-id $_BSTAPID4 -expected-id $_BSTAPID5 \
-	-expected-id $_BSTAPID6
+	-expected-id $_BSTAPID6 -expected-id $_BSTAPID7
 
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME