diff --git a/src/target/board/sheevaplug.cfg b/src/target/board/sheevaplug.cfg
index 61d324d0b..6fe3ce3eb 100644
--- a/src/target/board/sheevaplug.cfg
+++ b/src/target/board/sheevaplug.cfg
@@ -17,7 +17,13 @@ proc sheevaplug_init { } {
 
 	# We need to assert DBGRQ while holding nSRST down.
 	# However DBGACK will be set only when nSRST is released.
+	# Furthermore, the JTAG interface doesn't respond at all when
+	# the CPU is in the WFI (wait for interrupts) state, so it is
+	# possible that initial tap examination failed.  So let's
+	# re-examine the target again here when nSRST is asserted which
+	# should then succeed.
 	jtag_reset 0 1
+	feroceon.cpu arp_examine
 	halt 0
 	jtag_reset 0 0
 	wait_halt