--- a/stk500v2.c	Sun Jan 17 19:26:40 2016 +0000
+++ b/stk500v2.c	Wed Feb 17 04:38:28 2016 +0000
@@ -352,14 +352,14 @@
 	if (stk_addr & 0x80000000) {
 		stk_addr <<= 1;                 /* 32-BIT EXTENDED ADDRESS */
 	} else {
-                if (stk_addr >= 0x00600000) {	/* MANGLED ADDRESS */
-                        stk_addr -= 0x00600000;
-                        stk_addr <<= 1;
-                        stk_addr += PIC32_BOOT;
-                } else {
-                        stk_addr <<= 1;
-                        stk_addr += PIC32_CODE;
-                }
+		if (stk_addr >= 0x02C00000) {   /* BOOT RELATIVE ADDRESS */
+			stk_addr -= 0x02C00000;
+			stk_addr <<= 1;
+			stk_addr += PIC32_BOOT;
+		} else {                        /* PROGRAM RELATIVE ADDRESS */
+			stk_addr <<= 1;
+			stk_addr += PIC32_CODE;
+		}
 	}
 	stk500v2_ok();
 }