diff --git a/src/jtagmkII.c b/src/jtagmkII.c
index a3050b69..816faf8d 100644
--- a/src/jtagmkII.c
+++ b/src/jtagmkII.c
@@ -1197,6 +1197,7 @@ static int jtagmkII_initialize(const PROGRAMMER *pgm, const AVRPART *p) {
         serial_setparams(&pgm->fd, pgm->baudrate, SERIAL_8N1);
     }
   }
+
   if(pgm->bitclock) {
     if(pgm->flag & PGM_FL_IS_JTAG) {
       if(!(pgm->extra_features & HAS_BITCLOCK_ADJ))
diff --git a/src/pickit2.c b/src/pickit2.c
index 86301efd..e4bc1963 100644
--- a/src/pickit2.c
+++ b/src/pickit2.c
@@ -169,7 +169,7 @@ static void pickit2_teardown(PROGRAMMER *pgm) {
 }
 
 static int pickit2_open(PROGRAMMER *pgm, const char *port) {
-  if(pgm->bitclock && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
+  if((pgm->ispdelay > 0 || pgm->bitclock > 0) && !(pgm->extra_features & HAS_BITCLOCK_ADJ))
     pmsg_warning("setting bitclock despite HAS_BITCLOCK_ADJ missing in pgm->extra_features\n");
 
 #ifdef WIN32