diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 4e4f24fe..2b62577d 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,4 +1,8 @@
-2008-04-09  Kolja Waschk <kawk>
+2008-04-08  Kolja Waschk <kawk>
+
+   * src/cmd/idcode.c: [ 1936543 ] Check for set-up cable in idcode (U.Bonnes)
+
+2008-04-05  Kolja Waschk <kawk>
 
    * src/tap/cable/usbblaster.c: [ 1934843 ] Fix for USBBLASTER (U.Bonnes)
    * src/jtag.c: [ 1933141 ] Don't add duplicate history lines (U.Bonnes)
diff --git a/jtag/src/cmd/idcode.c b/jtag/src/cmd/idcode.c
index 5cff75ac..8c702021 100644
--- a/jtag/src/cmd/idcode.c
+++ b/jtag/src/cmd/idcode.c
@@ -44,6 +44,9 @@ cmd_idcode_run( chain_t *chain, char *params[] )
         else if (cmd_get_number( params[1], &bytes ))
                 return -1;
 
+        if (!cmd_test_cable( chain ))
+                return 1;
+
         printf( _("Reading %d bytes if idcode\n"), bytes );
 	idcode( chain , bytes);
         return 1;