diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index b5a86527e..97d76789e 100644
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -40,10 +40,11 @@ if { [info exists CPUTAPID ] } {
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
 
 if { [info exists BSTAPID ] } {
+   # FIXME this never gets used to override defaults...
    set _BSTAPID $BSTAPID
 } else {
   # See STM Document RM0008
-  # Section 26.6.2
+  # Section 29.6.2
   # Low density devices, Rev A
   set _BSTAPID1 0x06412041
   # Medium density devices, Rev A
@@ -55,7 +56,9 @@ if { [info exists BSTAPID ] } {
   # Connectivity line devices, Rev A and Rev Z
   set _BSTAPID5 0x06418041
 }
-jtag newtap $_CHIPNAME bs  -irlen 5 -ircapture 0x1 -irmask 0x1 -expected-id $_BSTAPID1 -expected-id $_BSTAPID2 -expected-id $_BSTAPID3 -expected-id $_BSTAPID4 -expected-id $_BSTAPID5
+jtag newtap $_CHIPNAME bs -irlen 5 -expected-id $_BSTAPID1 \
+	-expected-id $_BSTAPID2 -expected-id $_BSTAPID3 \
+	-expected-id $_BSTAPID4 -expected-id $_BSTAPID5
 
 set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNAME