diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
index 05e62e4c..7214f4e7 100644
--- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
+++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/USBD_HAL.c
@@ -1163,7 +1163,7 @@ void USBD_IrqHandler(void)
 
         TRACE_INFO_WP("EoBRes ");
 
-#if defined(BOARD_USB_DFU) && defined(dfu)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
 	if (g_dfu->past_manifest)
 		USBDFU_SwitchToApp();
 #endif
diff --git a/firmware/libboard/common/source/board_cstartup_gnu.c b/firmware/libboard/common/source/board_cstartup_gnu.c
index d5cb8bf7..87983620 100644
--- a/firmware/libboard/common/source/board_cstartup_gnu.c
+++ b/firmware/libboard/common/source/board_cstartup_gnu.c
@@ -124,7 +124,7 @@ IntFunc exception_table[] = {
     IrqHandlerNotUsed   /* 35 not used */
 };
 
-#if defined (BOARD_USB_DFU) && !defined(dfu)
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
 static void BootIntoApp(void)
 {
 	unsigned int *pSrc;
@@ -151,7 +151,8 @@ void ResetException( void )
     /* Low level Initialize */
     LowLevelInit() ;
 
-#if defined (BOARD_USB_DFU) && !defined(dfu)
+
+#if defined(BOARD_USB_DFU) && defined(APPLICATION_dfu)
     if (*(unsigned long *)IRAM_ADDR != 0xDFDFDFDF)
         BootIntoApp();
 #endif