diff --git a/firmware/target/arm/debug-pp.c b/firmware/target/arm/debug-pp.c
index 313e9713f8..7e4537ad71 100644
--- a/firmware/target/arm/debug-pp.c
+++ b/firmware/target/arm/debug-pp.c
@@ -27,6 +27,10 @@
 #include "font.h"
 #include "debug-target.h"
 
+#ifdef IPOD_ARCH
+#include "hwcompat.h"       /* needed for IPOD_HW_REVISION */
+#endif
+
 static int perfcheck(void)
 {
     int result;
diff --git a/firmware/target/arm/debug-target.h b/firmware/target/arm/debug-target.h
index 524d3b33fc..4b81d913b3 100644
--- a/firmware/target/arm/debug-target.h
+++ b/firmware/target/arm/debug-target.h
@@ -17,5 +17,9 @@
  *
  ****************************************************************************/
 
+#ifndef BUTTON_POWER
+#define DEBUG_CANCEL  BUTTON_MENU
+#else
 #define DEBUG_CANCEL  BUTTON_POWER
+#endif
 bool __dbg_hw_info(void);