diff --git a/configs/pic32mz-starterkit/README.txt b/configs/pic32mz-starterkit/README.txt
index 949c958b1f5..865f539da7f 100644
--- a/configs/pic32mz-starterkit/README.txt
+++ b/configs/pic32mz-starterkit/README.txt
@@ -165,6 +165,8 @@ Creating Compatible NuttX HEX files
 Tool Issues
 ===========
 
+  Pinquino Toolchain
+  ------------------
   If you use the Pinguino toolchain, you will probably see this error:
 
   C:\pinguino-11\compilers\p32\bin\p32-ld.exe: target elf32-tradlittlemips not found
@@ -178,6 +180,17 @@ Tool Issues
 
     OUTPUT_FORMAT("elf32-littlemips")
 
+  ICD3
+  ----
+  The onboard debugger is Slow and one is better off using an ICD3
+
+  Segger J-Link
+  -------------
+  If using a Jlink that only these versions work with PIC32:
+
+    J-Link BASE / EDU V9 or later
+    J-Link ULTRA+ / PRO V4 or later
+
 Serial Console
 ==============
 
diff --git a/configs/pic32mz-starterkit/scripts/c32-release.ld b/configs/pic32mz-starterkit/scripts/c32-release.ld
index 60b8a7b0329..002a8b00d0f 100644
--- a/configs/pic32mz-starterkit/scripts/c32-release.ld
+++ b/configs/pic32mz-starterkit/scripts/c32-release.ld
@@ -87,7 +87,7 @@ MEMORY
 	kseg1_bevexcpt (rx) : ORIGIN = 0xbfc00380, LENGTH = 128
 	kseg1_intexcpt (rx) : ORIGIN = 0xbfc00400, LENGTH = 128
 	kseg1_dbgexcpt (rx) : ORIGIN = 0xbfc00480, LENGTH = 16
-	kseg0_bootmem  (rx) : ORIGIN = 0x9fc00490, LENGTH = 8192-1168
+	kseg0_bootmem  (rx) : ORIGIN = 0x9fc004ac, LENGTH = 8192-1196
 	kseg1_dbgcode  (rx) : ORIGIN = 0xbfc02000, LENGTH = 4096-16
 	kseg1_adevcfg   (r) : ORIGIN = 0x1fc0ff40, LENGTH = 128
 	kseg1_devcfg    (r) : ORIGIN = 0x1fc0ffc0, LENGTH = 128
diff --git a/configs/pic32mz-starterkit/scripts/mips-release.ld b/configs/pic32mz-starterkit/scripts/mips-release.ld
index c70b5a2edc1..e6a8e22c160 100644
--- a/configs/pic32mz-starterkit/scripts/mips-release.ld
+++ b/configs/pic32mz-starterkit/scripts/mips-release.ld
@@ -87,7 +87,7 @@ MEMORY
 	kseg1_bevexcpt (rx) : ORIGIN = 0xbfc00380, LENGTH = 128
 	kseg1_intexcpt (rx) : ORIGIN = 0xbfc00400, LENGTH = 128
 	kseg1_dbgexcpt (rx) : ORIGIN = 0xbfc00480, LENGTH = 16
-	kseg0_bootmem  (rx) : ORIGIN = 0x9fc00490, LENGTH = 8192-1168
+	kseg0_bootmem  (rx) : ORIGIN = 0x9fc00ac0, LENGTH = 8192-1196
 	kseg1_dbgcode  (rx) : ORIGIN = 0xbfc02000, LENGTH = 4096-16
 	kseg1_adevcfg   (r) : ORIGIN = 0x1fc0ff40, LENGTH = 128
 	kseg1_devcfg    (r) : ORIGIN = 0x1fc0ffc0, LENGTH = 128