diff --git a/jtag/ChangeLog b/jtag/ChangeLog
index 60d4238d..c387a92b 100644
--- a/jtag/ChangeLog
+++ b/jtag/ChangeLog
@@ -1,5 +1,6 @@
 2007-12-16  Kolja Waschk <kawk>
 
+	* jtag.c: Don't abort on invalid command line options
     * configure.ac: Reorganized the libusb/libftdi detection.
     * data/MANUFACTURERS: Change 11110000111 code to point to
       "ARM" instead of Sharp to stop misdetection of other 
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 7c0a91fc..e9cfc3ef 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -382,11 +382,9 @@ main( int argc, const char **argv )
 			break;
 
 		case 'h':
+		default:
 			help = 1;
 			break;
-
-		default:
-			abort ();
 		}
 	}