diff --git a/tcl/target/ke0x.cfg b/tcl/target/ke0x.cfg
index b35776719..761a0a697 100644
--- a/tcl/target/ke0x.cfg
+++ b/tcl/target/ke0x.cfg
@@ -3,8 +3,8 @@
 #
 # Freescale Kinetis KE0x and KEAx series devices
 #
-
-source [find target/swj-dp.tcl]
+# Devices support SWD transport only
+transport select swd
 
 if { [info exists CHIPNAME] } {
     set _CHIPNAME $CHIPNAME
@@ -26,7 +26,7 @@ if { [info exists CPUTAPID] } {
    set _CPUTAPID 0x0bc11477
 }
 
-swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu
diff --git a/tcl/target/klx.cfg b/tcl/target/klx.cfg
index cd236b339..b4014ba5b 100644
--- a/tcl/target/klx.cfg
+++ b/tcl/target/klx.cfg
@@ -4,8 +4,8 @@
 # NXP (former Freescale) Kinetis KL series devices
 # Also used for Cortex-M0+ equipped members of KVx and KE1xZ series
 #
-
-source [find target/swj-dp.tcl]
+# Devices support SWD transport only
+transport select swd
 
 if { [info exists CHIPNAME] } {
     set _CHIPNAME $CHIPNAME
@@ -27,7 +27,7 @@ if { [info exists CPUTAPID] } {
     set _CPUTAPID 0x0bc11477
 }
 
-swj_newdap $_CHIPNAME cpu -irlen 4 -expected-id $_CPUTAPID
+swd newdap $_CHIPNAME cpu -expected-id $_CPUTAPID
 dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.cpu
 
 set _TARGETNAME $_CHIPNAME.cpu