diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 63fd5cc1..e6753c04 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,14 @@
+2003-09-15  Marcel Telka  <marcel@telka.sk>
+
+	* configure.ac: Fixed spelling (patch 805108, Andreas Mohr).
+	* src/jtag.c (main): Ditto.
+	* src/cmd/discovery.c (cmd_discovery_help, cmd_discovery): Ditto.
+	* src/cmd/flashmem.c (cmd_flashmem_help): Ditto.
+
+	* src/tap/cable/ei012.c: Changed comment (patch 805108, Andreas Mohr).
+	* src/tap/cable/keithkoep.c: Ditto.
+	* src/tap/cable/mpcbdm.c: Ditto.
+
 2003-09-14  Marcel Telka  <marcel@telka.sk>
 
 	* src/tap/cable/triton.c: New file (patch 805103, Andreas Mohr).
diff --git a/jtag/NEWS b/jtag/NEWS
index abbaeed7..7e77cd75 100644
--- a/jtag/NEWS
+++ b/jtag/NEWS
@@ -16,6 +16,7 @@ jtag-0.5.1:
 	* Fixed inverted TRST signal for Macraigor Wiggler JTAG Cable see patch 799377 for more info,
 		thanks to Mike Tesch for reporting).
 	* Added Ka-Ro TRITON (PXA255/250) JTAG Cable driver (patch 805103, Andreas Mohr).
+	* Spelling and documentation fixes (patch 805108, Andreas Mohr).
 	* Fixed minor bugs.
 
 jtag-0.5 (2003-08-19):
diff --git a/jtag/TODO b/jtag/TODO
index 6dc501bc..2f2f4e29 100644
--- a/jtag/TODO
+++ b/jtag/TODO
@@ -1,6 +1,6 @@
 $Id$
 
 * Write documentation.
-* Support for display the result of a boundary scan formated according to the CPU definitions (e.g. MA[0-26] = 0x00001c00).
+* Support for displaying the result of a boundary scan formatted according to the CPU definitions (e.g. MA[0-26] = 0x00001c00).
 * Remove direct relation between JTAG instruction and data register (e.g. ARM7TDMI).
 * SVF player.
diff --git a/jtag/configure.ac b/jtag/configure.ac
index 1e31a0b3..9e9d5460 100644
--- a/jtag/configure.ac
+++ b/jtag/configure.ac
@@ -73,7 +73,7 @@ AC_CACHE_CHECK([for the openwince includes], openwince_includes_path, [
 	done
 ])
 if test "$openwince_includes_path" = "no"; then
-	AC_MSG_ERROR([The openwince include package not found.])
+	AC_MSG_ERROR([The openwince include package can not be found.])
 fi
 CPPFLAGS="$CPPFLAGS -I$openwince_includes_path -I$openwince_includes_path/device -I$openwince_includes_path/arm"
 
diff --git a/jtag/src/cmd/discovery.c b/jtag/src/cmd/discovery.c
index 3111c154..b8882508 100644
--- a/jtag/src/cmd/discovery.c
+++ b/jtag/src/cmd/discovery.c
@@ -49,21 +49,21 @@ cmd_discovery_help( void )
 {
 	printf( _(
 		"Usage: %s\n"
-		"Discovery unknown parts in the JTAG chain.\n"
+		"Discovery of unknown parts in the JTAG chain.\n"
 		"\n"
 		"'%s' attempts to detect these parameters of an unknown JTAG\n"
 		"chain:\n"
 		" 1. IR (instruction register) length\n"
 		" 2. DR (data register) length for all possible instructions\n"
 		"\n"
-		"Warning: This may be dangerous for some parts (especially, if the\n"
+		"Warning: This may be dangerous for some parts (especially if the\n"
 		"part doesn't have TRST signal).\n"
 	), "discovery", "discovery" );
 }
 
 cmd_t cmd_discovery = {
 	"discovery",
-	N_("discovery unknown parts in the JTAG chain"),
+	N_("discovery of unknown parts in the JTAG chain"),
 	cmd_discovery_help,
 	cmd_discovery_run
 };
diff --git a/jtag/src/cmd/flashmem.c b/jtag/src/cmd/flashmem.c
index 0267fec2..d47b6188 100644
--- a/jtag/src/cmd/flashmem.c
+++ b/jtag/src/cmd/flashmem.c
@@ -76,7 +76,7 @@ cmd_flashmem_help( void )
 		"Usage: %s FILENAME\n"
 		"Program FILENAME content to flash memory.\n"
 		"\n"
-		"ADDR       target addres for raw binary image\n"
+		"ADDR       target address for raw binary image\n"
 		"FILENAME   name of the input file\n"
 		"%-10s FILENAME is in MS .bin format (for WinCE)\n"
 		"\n"
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index e2f7bf52..e0a88da5 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -271,7 +271,7 @@ main( int argc, const char **argv )
 		return -1;
 	}
 
-	printf( _("Warning: %s may damage your hardware! Type \"quit\" for exit!\n\n"), PACKAGE_NAME );
+	printf( _("Warning: %s may damage your hardware! Type \"quit\" to exit!\n\n"), PACKAGE_NAME );
 	printf( _("Type \"help\" for help.\n\n") );
 
 	for (i = 1; i < argc; i++) {
diff --git a/jtag/src/tap/cable/ei012.c b/jtag/src/tap/cable/ei012.c
index 43fc9dac..f95b3183 100644
--- a/jtag/src/tap/cable/ei012.c
+++ b/jtag/src/tap/cable/ei012.c
@@ -40,6 +40,8 @@
 #define	TRST	4
 
 /*
+ * status
+ *
  * 7 - BUSY (pin 11)
  * 6 - ACK (pin 10)
  * 5 - PE (pin 12)
diff --git a/jtag/src/tap/cable/keithkoep.c b/jtag/src/tap/cable/keithkoep.c
index a25c6e5d..dd03cc18 100644
--- a/jtag/src/tap/cable/keithkoep.c
+++ b/jtag/src/tap/cable/keithkoep.c
@@ -43,6 +43,8 @@
 #define	TMS	2
 
 /*
+ * status
+ * 
  * 7 - BUSY (pin 11)
  * 6 - ACK (pin 10)
  * 5 - PE (pin 12)
@@ -52,6 +54,8 @@
 #define	TDO	5
 
 /* 
+ * control
+ *
  * 0 - STROBE (pin 1)
  * 1 - AUTOFD (pin 14)
  * 2 - INIT (pin 16)
diff --git a/jtag/src/tap/cable/mpcbdm.c b/jtag/src/tap/cable/mpcbdm.c
index d1b6fbee..ca4f968f 100644
--- a/jtag/src/tap/cable/mpcbdm.c
+++ b/jtag/src/tap/cable/mpcbdm.c
@@ -36,7 +36,7 @@
 #include "generic.h"
 
 /*
- * data
+ * data D[7:0] (pins 9:2)
  */
 #define	TDI	1
 #define	TCK	0
@@ -51,6 +51,12 @@
 
 /* 
  * status
+ *
+ * 7 - BUSY (pin 11)
+ * 6 - ACK (pin 10)
+ * 5 - PE (pin 12)
+ * 4 - SEL (pin 13)
+ * 3 - ERROR (pin 15)
  */
 #define	TDO 	5