diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 46952232..d77f42b1 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-03  Marcel Telka  <marcel@telka.sk>
+
+	* include/Makefile.am (noinst_HEADERS): Added cmd.h.
+	* include/cmd.h: New file.
+	* src/cmd/Makefile.am (libcmd_a_SOURCES): Removed cmd.h.
+	* src/cmd/cmd.h: File removed. Partially moved to include module (file brux/cmd.h).
+
+	* src/cmd/detectflash.c (cmd_detectflash_help): Changed help text.
+
 2003-06-03  Marcel Telka  <marcel@telka.sk>
 
 	* src/readmem.c (detectflash): Function extracted to module libbrux, file flash/detectflash.c.
diff --git a/jtag/include/Makefile.am b/jtag/include/Makefile.am
index 7f22e4d0..86d2119f 100644
--- a/jtag/include/Makefile.am
+++ b/jtag/include/Makefile.am
@@ -30,6 +30,7 @@ noinst_HEADERS = \
 	cfi.h \
 	chain.h \
 	data_register.h \
+	cmd.h \
 	flash.h \
 	gettext.h \
 	instruction.h \
diff --git a/jtag/src/cmd/cmd.h b/jtag/include/cmd.h
similarity index 80%
rename from jtag/src/cmd/cmd.h
rename to jtag/include/cmd.h
index a0849ef6..4843d49a 100644
--- a/jtag/src/cmd/cmd.h
+++ b/jtag/include/cmd.h
@@ -25,16 +25,8 @@
 #ifndef CMD_H
 #define	CMD_H
 
-typedef struct {
-	char *name;
-	char *desc;
-	void (*help)( void );
-	int (*run)( char *params[] );
-} cmd_t;
+#include <brux/cmd.h>
 
-int cmd_run( char *params[] );
-int cmd_params( char *params[] );
-int cmd_get_number( char *s, unsigned int *i );
 int cmd_test_cable( void );
 
 #endif /* CMD_H */
diff --git a/jtag/src/cmd/Makefile.am b/jtag/src/cmd/Makefile.am
index 1b83e837..875205f4 100644
--- a/jtag/src/cmd/Makefile.am
+++ b/jtag/src/cmd/Makefile.am
@@ -26,7 +26,6 @@ include $(top_srcdir)/Makefile.rules
 noinst_LIBRARIES = libcmd.a
 
 libcmd_a_SOURCES = \
-	cmd.h \
 	quit.c \
 	help.c \
 	frequency.c \
diff --git a/jtag/src/cmd/detectflash.c b/jtag/src/cmd/detectflash.c
index d707d18d..4ea98838 100644
--- a/jtag/src/cmd/detectflash.c
+++ b/jtag/src/cmd/detectflash.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 
-#include "jtag.h"
+#include <brux/flash.h>
 
 #include "cmd.h"
 
@@ -51,10 +51,7 @@ cmd_detectflash_help( void )
 {
 	printf( _(
 		"Usage: %s\n"
-		"Detect flash memory type connected to part.\n"
-		"\n"
-		"Only detects flash connected to part 0. Part 0 must support\n"
-		"bus operations.\n"
+		"Detect flash memory type connected to a part.\n"
 	), "detectflash" );
 }