diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 7a9ca093..bfcdd1ff 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -3,6 +3,8 @@
    * src/tap/usbconn/libusb.c (usbconn_libusb_connect): Use the
      usb_get_busses() function rather than the usb_busses global
      variable due to portability issues (like with libusb-win32).
+   * src/jtag.c (jtag_readline_loop): [ 1950315 ] Fix quiting when
+     using the non readline version.
 
 2008-04-19  Kolja Waschk <kawk>
 
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index f5506d54..23f8e954 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -225,7 +225,8 @@ jtag_readline_loop( chain_t *chain, const char *prompt )
 	line[0] = 0;
 	do
 	{
-		jtag_readline_multiple_commands_support( chain, line );
+		if (!jtag_readline_multiple_commands_support( chain, line ))
+			break;
 		printf("%s", prompt);
 		fflush(stdout);
 	}