diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 46baebc4..8ed488c1 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-23  Arnim Laeuger  <arniml@users.sourceforge.net>
 
+  * src/tap/usbconn/libftdi.c, src/tap/usbconn/libftd2xx.c:
+    keep JTAG dongle in current mode (Holger Schurig)
+
   * data/atmel/at32ap7000/at32ap7000: clarifications for AVR32 data
     (Holger Schurig)
 
diff --git a/jtag/src/tap/usbconn/libftd2xx.c b/jtag/src/tap/usbconn/libftd2xx.c
index 488de730..68f1b0d9 100644
--- a/jtag/src/tap/usbconn/libftd2xx.c
+++ b/jtag/src/tap/usbconn/libftd2xx.c
@@ -390,9 +390,6 @@ usbconn_ftd2xx_open( usbconn_t *conn )
   if (status == FT_OK) if ((status =  FT_Purge( fc, FT_PURGE_RX )) != FT_OK)
     printf( _("%s(): Can't purge RX buffer.\n"), __FUNCTION__ );
 
-  if (status == FT_OK) if ((status =  FT_SetBitMode( fc, 0x00, 0x00 )) != FT_OK)
-    printf( _("%s(): Can't disable bitmode.\n"), __FUNCTION__ );
-
   if (status == FT_OK) if ((status = FT_SetLatencyTimer(fc, 2)) != FT_OK)
     printf( _("%s(): Can't set latency timer.\n"), __FUNCTION__ );
 
@@ -444,8 +441,6 @@ usbconn_ftd2xx_mpsse_open( usbconn_t *conn )
   if (status == FT_OK) if ((status = FT_SetLatencyTimer( fc, 16 )) != FT_OK)
     printf( _("%s(): Can't set target latency timer.\n"), __FUNCTION__ );
 
-  if (status == FT_OK) if ((status =  FT_SetBitMode( fc, 0x00, 0x00 )) != FT_OK)
-    printf( _("%s(): Can't disable bitmode.\n"), __FUNCTION__ );
   if (status == FT_OK) if ((status =  FT_SetBitMode( fc, 0x0b, 0x02 /* BITMODE_MPSSE */ )) != FT_OK)
     printf( _("%s(): Can't set MPSSE bitmode.\n"), __FUNCTION__ );
 
@@ -496,7 +491,6 @@ usbconn_ftd2xx_close( usbconn_t *conn )
 
   if (p->fc)
   {
-    FT_SetBitMode( p->fc, 0x00, 0x00 );
     FT_Close( p->fc );
     p->fc = NULL;
   }
diff --git a/jtag/src/tap/usbconn/libftdi.c b/jtag/src/tap/usbconn/libftdi.c
index 0f4efdfb..fa965c91 100644
--- a/jtag/src/tap/usbconn/libftdi.c
+++ b/jtag/src/tap/usbconn/libftdi.c
@@ -409,10 +409,6 @@ usbconn_ftdi_open( usbconn_t *conn )
   r = seq_reset( fc );
   if (r >= 0) r = seq_purge( fc, 1, 0 );
 
-  if (r >= 0) if ((r = ftdi_disable_bitbang( fc )) < 0)
-    printf( _("%s(): ftdi_disable_bitbang() failed: %s\n"),
-            __FUNCTION__, ftdi_get_error_string( fc ) );
-
   if (r >= 0) if ((r = ftdi_set_latency_timer( fc, 2 )) < 0)
     printf( _("%s(): ftdi_set_latency_timer() failed: %s\n"),
             __FUNCTION__, ftdi_get_error_string( fc ) );
@@ -480,10 +476,6 @@ usbconn_ftdi_mpsse_open( usbconn_t *conn )
     printf( _("%s(): ftdi_set_latency_timer() failed: %s\n"),
             __FUNCTION__, ftdi_get_error_string( fc ) );
 
-  if (r >= 0) if ((r = ftdi_disable_bitbang( fc )) < 0)
-    printf( _("%s(): ftdi_disable_bitbang() failed: %s\n"),
-            __FUNCTION__, ftdi_get_error_string( fc ) );
-
   if (r >= 0) if ((r = ftdi_set_bitmode( fc, 0x0b, BITMODE_MPSSE )) < 0)
     printf( _("%s(): ftdi_set_bitmode() failed: %s\n"),
             __FUNCTION__, ftdi_get_error_string( fc ) );
@@ -532,7 +524,6 @@ usbconn_ftdi_close( usbconn_t *conn )
 
   if (p->fc)
   {
-    ftdi_disable_bitbang( p->fc );
     ftdi_usb_close( p->fc );
     ftdi_deinit( p->fc );
     p->fc = NULL;