diff --git a/tcl/target/pic32mx.cfg b/tcl/target/pic32mx.cfg
index 598c905cf..8a8eea0eb 100644
--- a/tcl/target/pic32mx.cfg
+++ b/tcl/target/pic32mx.cfg
@@ -62,6 +62,20 @@ $_TARGETNAME configure -event reset-init {
 	mww 0xbf882020 $_WORKAREASIZE
 	# BMXDUPBA: 0k user program - (BMXDUPBA - BMXDUDBA)
 	mww 0xbf882030 $_WORKAREASIZE
+
+	#
+	# Set system clock to 8Mhz if the default clock configuration is set
+	#
+
+	# SYSKEY register, make sure OSCCON is locked
+	mww 0xbf80f230 0x0
+	# SYSKEY register, write unlock sequence
+	mww 0xbf80f230 0xaa996655
+	mww 0xbf80f230 0x556699aa
+	# OSCCON register + 4, clear OSCCON FRCDIV bits: 24, 25 and 26, divided by 1
+	mww 0xbf80f004 0x07000000
+	# SYSKEY register, relock OSCCON
+	mww 0xbf80f230 0x0
 }
 
 set _FLASHNAME $_CHIPNAME.flash0