diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index eb512868..f8c4ee1d 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-14  Marcel Telka  <marcel@telka.sk>
+
+	* src/jtag.c (jtag): Added command history load/save support (August Hörandl).
+
 2003-02-14  Marcel Telka  <marcel@telka.sk>
 
 	* src/readmem.c (readmem): Added support for 1 x 16 bit memory configuration and
diff --git a/jtag/NEWS b/jtag/NEWS
index 4556bada..18d13bd9 100644
--- a/jtag/NEWS
+++ b/jtag/NEWS
@@ -11,6 +11,7 @@ $Id$
 	* Added JTAG declarations for Xilinx XC2C256-TQ144 (Alessandro Zummo).
 	* Added support for 1 x 16 bit memory configuration (Christian Pellegrin).
 	* Added buffered file reads/writes (Christian Pellegrin).
+	* Added command history load/save support (August Hörandl).
 
 jtag-0.2.2 (2003-02-04):
 
diff --git a/jtag/THANKS b/jtag/THANKS
index 64a23475..9025826c 100644
--- a/jtag/THANKS
+++ b/jtag/THANKS
@@ -7,3 +7,4 @@ Christian Pellegrin
 Ian Campbell
 Alex (d18c7db)
 Alessandro Zummo
+August Hörandl
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 2db41816..b4ca05db 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -74,6 +74,9 @@ main( void )
 	printf( "Warning: %s may damage your hardware! Type \"quit\" for exit!\n\n", PACKAGE );
 	printf( "Type \"help\" for help.\n\n" );
 
+	using_history();
+	read_history(".jtag_history");
+
 	for (;;) {
 		char *t;
 
@@ -599,5 +602,6 @@ main( void )
 		cable = NULL;
 	}
 
+	write_history(".jtag_history");
 	return 0;
 }