diff --git a/src/target/arm11.c b/src/target/arm11.c
index ea88d5c0b..da779b08e 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -92,6 +92,7 @@ target_type_t arm11_target =
     ARM11_HANDLER(register_commands),
     ARM11_HANDLER(target_command),
     ARM11_HANDLER(init_target),
+    ARM11_HANDLER(examine),
     ARM11_HANDLER(quit),
 };
 
@@ -1371,6 +1372,13 @@ int arm11_target_command(struct command_context_s *cmd_ctx, char *cmd, char **ar
 }
 
 int arm11_init_target(struct command_context_s *cmd_ctx, struct target_s *target)
+{
+	/* Initialize anything we can set up without talking to the target */
+	return ERROR_OK;
+}
+
+/* talk to the target and set things up */
+int arm11_examine(struct command_context_s *cmd_ctx, struct target_s *target)
 {
     FNC_INFO;
 
diff --git a/src/target/arm11.h b/src/target/arm11.h
index faa93f586..8b05b2e1c 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -188,6 +188,7 @@ int arm11_target_request_data(struct target_s *target, u32 size, u8 *buffer);
 int arm11_halt(struct target_s *target);
 int arm11_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution);
 int arm11_step(struct target_s *target, int current, u32 address, int handle_breakpoints);
+int arm11_examine(struct command_context_s *cmd_ctx, struct target_s *target);
 
 /* target reset control */
 int arm11_assert_reset(struct target_s *target);