diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 7288db5e..480fbe9e 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-04  Marcel Telka  <marcel@telka.sk>
+
+	* src/help.c (help): Added missing short help description for 'set' command.
+	* src/jtag.c (main): Added test for uninitialized ps for 'set' command.
+	* src/tap/tap.c (tap_shift_register): Changed final state to Run-Test/Idle
+		for immediately propagation of the new BSR values.
+
 2003-02-04  Marcel Telka  <marcel@telka.sk>
 
 	* src/jtag.c (main): Added more checks for syntax errors. Added support for
diff --git a/jtag/src/help.c b/jtag/src/help.c
index 80618e79..a7f0a446 100644
--- a/jtag/src/help.c
+++ b/jtag/src/help.c
@@ -51,7 +51,7 @@ help( const char *cmd )
 			"detectflash   detect parameters of flash chip attached to a part\n"
 			"readmem       read content of the memory and write it to file\n"
 			"flashmem      burn flash memory with data from a file\n"
-			"set           TODO\n"
+			"set           set external signal value\n"
 			"\n"
 			"Type \"help COMMAND\" for details about particular command.\n", PACKAGE
 		);
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index bd62355d..4bde94ea 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -522,6 +522,11 @@ main( void )
 				continue;
 			}
 
+			if (!ps) {
+				printf( "Run \"detect\" first.\n" );
+				continue;
+			}
+
 			t = get_token( NULL );
 			if (!t || strcmp( t, "signal" ) != 0) {
 				printf( "set: syntax error\n" );
diff --git a/jtag/src/tap/tap.c b/jtag/src/tap/tap.c
index f6d492e5..6b725071 100644
--- a/jtag/src/tap/tap.c
+++ b/jtag/src/tap/tap.c
@@ -60,8 +60,10 @@ tap_shift_register( const tap_register *in, tap_register *out, int exit )
 		tap_clock( (exit && ((i + 1) == in->len)) ? 1 : 0, in->data[i] );	/* Shift (& Exit1) */
 	}
 	/* Shift-DR, Shift-IR, Exit1-DR or Exit1-IR state */
-	if (exit)
+	if (exit) {
 		tap_clock( 1, 0 );		/* Update-DR or Update-IR */
+		tap_clock( 0, 0 );		/* Run-Test/Idle */
+	}
 }
 
 void