diff --git a/configs/pic32mz-starterkit/include/board.h b/configs/pic32mz-starterkit/include/board.h
index eced3709026..b5567ed7f5a 100644
--- a/configs/pic32mz-starterkit/include/board.h
+++ b/configs/pic32mz-starterkit/include/board.h
@@ -61,6 +61,8 @@
 
 #define BOARD_FNOSC_SPLL       1         /* Use system PLL */
 #define BOARD_POSC_HSMODE      1         /* High-speed crystal (HS) mode */
+#define BOARD_POSC_SWITCH      1         /* Enable clock switching */
+#undef  BOARD_POSC_FSCM                  /* Disable clock monitoring */
 
 /* PLL configuration and resulting CPU clock.
  * CPU_CLOCK = ((POSC_FREQ / IDIV) * MULT) / ODIV
@@ -143,7 +145,7 @@
 
 /* Watchdog pre-scaler (re-visit) */
 
-#define BOARD_WD_PRESCALER     8         /* Watchdog pre-scaler */
+#define BOARD_WD_PRESCALER     1048576   /* Watchdog pre-scaler */
 
 /* LED definitions **********************************************************/
 /* LED Configuration ********************************************************/
diff --git a/configs/pic32mz-starterkit/nsh/defconfig b/configs/pic32mz-starterkit/nsh/defconfig
index 4de30b17092..37ce95473c7 100644
--- a/configs/pic32mz-starterkit/nsh/defconfig
+++ b/configs/pic32mz-starterkit/nsh/defconfig
@@ -152,14 +152,14 @@ CONFIG_PIC32MZ_UART1=y
 # Device Configuration 0 (DEVCFG0)
 #
 # CONFIG_PIC32MZ_DEBUGGER_ENABLE is not set
-CONFIG_PIC32MZ_JTAG_ENABLE=y
-# CONFIG_PIC32MZ_ICESEL_CH2 is not set
+# CONFIG_PIC32MZ_JTAG_ENABLE is not set
+CONFIG_PIC32MZ_ICESEL_CH2=y
 # CONFIG_PIC32MZ_TRACE_ENABLE is not set
 
 #
 # Device Configuration 1 (DEVCFG1)
 #
-CONFIG_CONFIG_PIC32MZ_OSCIOFNC=0
+CONFIG_CONFIG_PIC32MZ_OSCIOFNC=1
 # CONFIG_PIC32MZ_WDTENABLE is not set
 
 #
@@ -683,7 +683,6 @@ CONFIG_EXAMPLES_NSH=y
 #
 # CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
 # CONFIG_NETUTILS_TFTPC is not set