diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 14145395..9c4b9206 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-03  Marcel Telka  <marcel@telka.sk>
+
+	* src/cmd/cable.c (cmd_cable_run): Added bus deallocation.
+	* src/cmd/detectflash.c (cmd_detectflash_run): Removed cable connection test.
+	* src/cmd/flashmem.c (cmd_flashmem_run): Ditto.
+	* src/cmd/peekpoke.c (cmd_peek_run, cmd_poke_run): Ditto.
+	* src/cmd/readmem.c (cmd_readmem_run): Ditto.
+
 2003-06-03  Marcel Telka  <marcel@telka.sk>
 
 	* src/flash.c (flashmsbin, flashmem): Removed '\r' from translatable messages.
diff --git a/jtag/NEWS b/jtag/NEWS
index 3d9223dd..e007752a 100644
--- a/jtag/NEWS
+++ b/jtag/NEWS
@@ -2,6 +2,7 @@ $Id$
 
 	* Fixed bug with SELECT, AUTOFD, and STROBE signals handling (bug 745824).
 	* Added new commands 'peek' and 'poke' (patch 747447, Matan Ziv-Av).
+	* Minor bugs fixed.
 
 jtag-0.4 (2003-05-29):
 
diff --git a/jtag/src/cmd/cable.c b/jtag/src/cmd/cable.c
index d68f6093..d8bc4f15 100644
--- a/jtag/src/cmd/cable.c
+++ b/jtag/src/cmd/cable.c
@@ -32,6 +32,7 @@
 #include "cable.h"
 #include "chain.h"
 #include "jtag.h"
+#include "bus.h"
 
 #include "cmd.h"
 
@@ -53,6 +54,10 @@ cmd_cable_run( char *params[] )
 		return 1;
 	}
 
+	if (bus) {
+		bus->free( bus );
+		bus = NULL;
+	}
 	chain_disconnect( chain );
 	chain->cable = parport_drivers[i]->connect( (const char **) &params[2], cmd_params( params ) - 2 );
 	if (!chain->cable) {
diff --git a/jtag/src/cmd/detectflash.c b/jtag/src/cmd/detectflash.c
index 9b761f15..d707d18d 100644
--- a/jtag/src/cmd/detectflash.c
+++ b/jtag/src/cmd/detectflash.c
@@ -36,9 +36,6 @@ cmd_detectflash_run( char *params[] )
 	if (cmd_params( params ) != 1)
 		return -1;
 
-	if (!cmd_test_cable())
-		return 1;
-
 	if (!bus) {
 		printf( _("Error: Bus driver missing.\n") );
 		return 1;
diff --git a/jtag/src/cmd/flashmem.c b/jtag/src/cmd/flashmem.c
index 5e63a528..13d85c6d 100644
--- a/jtag/src/cmd/flashmem.c
+++ b/jtag/src/cmd/flashmem.c
@@ -43,9 +43,6 @@ cmd_flashmem_run( char *params[] )
 	if (cmd_params( params ) != 3)
 		return -1;
 
-	if (!cmd_test_cable())
-		return 1;
-
 	if (!bus) {
 		printf( _("Error: Bus driver missing.\n") );
 		return 1;
diff --git a/jtag/src/cmd/peekpoke.c b/jtag/src/cmd/peekpoke.c
index 0335fb77..09ae2778 100644
--- a/jtag/src/cmd/peekpoke.c
+++ b/jtag/src/cmd/peekpoke.c
@@ -39,9 +39,6 @@ cmd_peek_run( char *params[] )
 	if (cmd_params( params ) != 2)
 		return -1;
 
-	if (!cmd_test_cable())
-		return 1;
-
 	if (!bus) {
 		printf( _("Error: Bus driver missing.\n") );
 		return 1;
@@ -87,9 +84,6 @@ cmd_poke_run( char *params[] )
 	if (cmd_params( params ) != 3)
 		return -1;
 
-	if (!cmd_test_cable())
-		return 1;
-
 	if (!bus) {
 		printf( _("Error: Bus driver missing.\n") );
 		return 1;
diff --git a/jtag/src/cmd/readmem.c b/jtag/src/cmd/readmem.c
index d83081ac..d8d20960 100644
--- a/jtag/src/cmd/readmem.c
+++ b/jtag/src/cmd/readmem.c
@@ -41,9 +41,6 @@ cmd_readmem_run( char *params[] )
 	if (cmd_params( params ) != 4)
 		return -1;
 
-	if (!cmd_test_cable())
-		return 1;
-
 	if (!bus) {
 		printf( _("Error: Bus driver missing.\n") );
 		return 1;