diff --git a/Makefile.toml b/Makefile.toml
index b9804df..78dfad8 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -23,8 +23,9 @@ QEMU = { value = "qemu-system-aarch64", condition = { env_not_set = ["QEMU"] } }
 # An aarch64-enabled GDB
 GDB = { value = "/usr/local/opt/gdb-8.2.1-aarhc64/bin/aarch64-linux-elf-gdb", condition = { env_not_set = ["GDB"] } }
 
-# OpenOCD with JLink support and RTT patch from http://openocd.zylin.com/#/c/4055/11
-OPENOCD = { value = "/usr/local/openocd-aeb7b327-rtt/bin/openocd", condition = { env_not_set = ["OPENOCD"] } }
+# OpenOCD with JLink support
+# (RTT patch from http://openocd.zylin.com/#/c/4055/11 has already been merged into main line)
+OPENOCD = { value = "/usr/local/opt/openocd/4d6519593-rtt/bin/openocd", condition = { env_not_set = ["OPENOCD"] } }
 
 # Mounted sdcard partition path
 VOLUME = { value = "/Volumes/BOOT", condition = { env_not_set = ["VOLUME"] } }
diff --git a/doc/rpi2rpi_jtag/rpi3_target.cfg b/doc/rpi2rpi_jtag/rpi3_target.cfg
index 9ea0f80..eb206e6 100644
--- a/doc/rpi2rpi_jtag/rpi3_target.cfg
+++ b/doc/rpi2rpi_jtag/rpi3_target.cfg
@@ -9,7 +9,7 @@ transport select jtag
 # we need to enable srst even though we don't connect it
 reset_config trst_and_srst
 
-adapter_khz 4000
+adapter speed 4000
 jtag_ntrst_delay 500
 
 if { [info exists CHIPNAME] } {
@@ -40,7 +40,7 @@ set _cores 4
 for { set _core 0 } { $_core < $_cores } { incr _core } {
 
     cti create $_CTINAME.$_core -dap $_CHIPNAME.dap -ap-num 0 \
-        -ctibase [lindex $CTIBASE $_core]
+        -baseaddr [lindex $CTIBASE $_core]
 
     target create $_TARGETNAME.$_core aarch64 \
         -dap $_CHIPNAME.dap -coreid $_core \
diff --git a/nucleus/Makefile.toml b/nucleus/Makefile.toml
index d518354..9bd55cf 100644
--- a/nucleus/Makefile.toml
+++ b/nucleus/Makefile.toml
@@ -94,7 +94,7 @@ script = [
 script_runner = "@duckscript"
 script = [
 '''
-    writefile ${GDB_CONNECT_FILE} "target remote :5555\n"
+    writefile ${GDB_CONNECT_FILE} "target extended-remote :5555\n"
 '''
 ]