diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog
index 2e751d03..bc06c871 100644
--- a/urjtag/ChangeLog
+++ b/urjtag/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-21  Jie Zhang  <jie.zhang@analog.com>
+
+  * src/apps/jtag/jtag.c (main): Don't trigger open file error
+    if the last command is "quit".
+
 2010-01-20  Jie Zhang  <jie.zhang@analog.com>
 
   * po/POTFILES.in: Remove src/bsdl/bsdl_bison.c, src/bsdl/bsdl_flex.c,
diff --git a/urjtag/src/apps/jtag/jtag.c b/urjtag/src/apps/jtag/jtag.c
index 339e9997..fe530655 100644
--- a/urjtag/src/apps/jtag/jtag.c
+++ b/urjtag/src/apps/jtag/jtag.c
@@ -488,7 +488,7 @@ main (int argc, char *const argv[])
 
             go = urj_parse_file (URJ_LOG_LEVEL_NORMAL, chain, argv[i]);
             cleanup (chain);
-            if (go < 0)
+            if (go < 0 && go != URJ_STATUS_MUST_QUIT)
             {
                 printf (_("Unable to open file `%s'!\n"), argv[i]);
                 break;