diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 5e64cb84d..598c905cf 100644
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -40,7 +40,7 @@ target create $_TARGETNAME mips_m4k -endian $_ENDIAN -chain-position $_TARGETNAM
 #
 
 global _PIC32MX_DATASIZE
-global _PIC32MX_PROGSIZE
+global _WORKAREASIZE
 set _PIC32MX_DATASIZE 0x800
 set _PIC32MX_PROGSIZE [expr ($_WORKAREASIZE - $_PIC32MX_DATASIZE)]
 
@@ -52,16 +52,16 @@ $_TARGETNAME configure -event reset-init {
 	#
 
 	global _PIC32MX_DATASIZE
-	global _PIC32MX_PROGSIZE
+	global _WORKAREASIZE
 
 	# BMXCON
 	mww 0xbf882000 0x001f0040
-	# BMXDKPBA: 2k kernel data @ 0xa0000800
+	# BMXDKPBA: 2k kernel data @ 0xa0000000
 	mww 0xbf882010 $_PIC32MX_DATASIZE
-	# BMXDUDBA: 16k kernel program @ 0xa0000800
-	mww 0xbf882020 $_PIC32MX_PROGSIZE
-	# BMXDUPBA: 0k user program
-	mww 0xbf882030 $_PIC32MX_PROGSIZE
+	# BMXDUDBA: 14k kernel program @ 0xa0000800 - (BMXDUDBA - BMXDKPBA)
+	mww 0xbf882020 $_WORKAREASIZE
+	# BMXDUPBA: 0k user program - (BMXDUPBA - BMXDUDBA)
+	mww 0xbf882030 $_WORKAREASIZE
 }
 
 set _FLASHNAME $_CHIPNAME.flash0