diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 6cb0a6a4..5572c680 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-03  Kolja Waschk <kawk>
 
+   * src/jtag.c: Optionally use JTAG_PROMPT environment setting for
+     prompt instead of "jtag>" (by Mike Frysinger)
+
    * include/jtag.h, src/cmd/jtag_data_dir.c, src/cmd/include.c,
      src/cmd/Makefile.am, src/bsdl/Makefile.am, src/bsdl/bsdl_flex.l,
      src/lib/make-relative-prefix.c, src/lib/safe-ctype.h,
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 147f0001..182901d8 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -449,7 +449,7 @@ main( int argc, char *const argv[] )
 #endif
 
 		/* main loop */
-		jtag_readline_loop( chain, "jtag> " );
+		jtag_readline_loop( chain, getenv("JTAG_PROMPT") ? : "jtag> " );
 
 #ifdef HAVE_READLINE_HISTORY
 		/* Save history */