diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 881c8e73..a9eac45a 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-16  Marcel Telka  <marcel@telka.sk>
+
+	* src/jtag.c (main): Corrected error message for 'instruction' command and added
+		a notice when an instruction is unknown (Alessandro Zummo).
+
 2003-02-16  Marcel Telka  <marcel@telka.sk>
 
 	* src/jtag.c (main): Fixed segfault in 'detectflash'. Thanks to August Hörandl
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index d1120705..4ab44b8a 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -423,7 +423,7 @@ main( void )
 
 			t = get_token( NULL );
 			if (!t) {
-				printf( "Missing instruction name\n" );
+				printf( "instruction: missing instruction name\n" );
 				continue;
 			}
 
@@ -433,6 +433,8 @@ main( void )
 			}
 
 			part_set_instruction( ps->parts[n], t );
+			if (ps->parts[n]->active_instruction == NULL)
+				printf( "instruction: unknown instruction %s\n", t );
 
 			continue;
 		}