diff --git a/src/isa-arm.c b/src/isa-arm.c
index 7bffbe139..fbe0cb95e 100644
--- a/src/isa-arm.c
+++ b/src/isa-arm.c
@@ -417,6 +417,7 @@ DEFINE_INSTRUCTION_ARM(BX,)
 // End branch definitions
 
 // TODO
+DEFINE_INSTRUCTION_ARM(BKPT,)
 DEFINE_INSTRUCTION_ARM(ILL,) // Illegal opcode
 
 DEFINE_INSTRUCTION_ARM(MSR, \
@@ -538,7 +539,7 @@ DEFINE_INSTRUCTION_ARM(SWI,)
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
-	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
+	DECLARE_INSTRUCTION_ARM(EMITTER, BKPT), \
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
 	DECLARE_INSTRUCTION_ARM(EMITTER, ILL), \
diff --git a/src/isa-thumb.c b/src/isa-thumb.c
index b310730a8..d9ee94f6c 100644
--- a/src/isa-thumb.c
+++ b/src/isa-thumb.c
@@ -197,6 +197,7 @@ DEFINE_INSTRUCTION_THUMB(PUSH, )
 DEFINE_INSTRUCTION_THUMB(PUSHR, )
 
 DEFINE_INSTRUCTION_THUMB(ILL, )
+DEFINE_INSTRUCTION_THUMB(BKPT, )
 DEFINE_INSTRUCTION_THUMB(BX, )
 
 #define DECLARE_INSTRUCTION_THUMB(EMITTER, NAME) \
@@ -283,6 +284,7 @@ DEFINE_INSTRUCTION_THUMB(BX, )
 	DO_8(DECLARE_INSTRUCTION_THUMB(EMITTER, ILL)), \
 	DO_4(DECLARE_INSTRUCTION_THUMB(EMITTER, POP)), \
 	DO_4(DECLARE_INSTRUCTION_THUMB(EMITTER, POPR)), \
+	DO_4(DECLARE_INSTRUCTION_THUMB(EMITTER, BKPT)), \
 
 static const ThumbInstruction _thumbTable[0x400] = {
 	DECLARE_THUMB_EMITTER_BLOCK(_ThumbInstruction)