diff --git a/ChangeLog b/ChangeLog
index 0dbacaa0b5bf0d66c5b0e3c517a908dbe65e533e..23a0331a9f1c7e9e44dbb324785c2a8442dc785f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* examples/eratosthenes.c (main): Don't allocate bitmap storage
 	for limit == 2 (early exit), closing memory leak at exit.
+	(main): Fix handling of short -q option.
 
 	* eccdata.c (output_curve): Replace mpz_init_set_ui by mpz_set_ui,
 	to fix memory leak.
diff --git a/examples/eratosthenes.c b/examples/eratosthenes.c
index 415c6d2595ea7b8adf47dade01c1e9e5b630cb79..711618200e86b6aa999025b4eb1fbd9c0c9a9ecc 100644
--- a/examples/eratosthenes.c
+++ b/examples/eratosthenes.c
@@ -262,7 +262,7 @@ main (int argc, char **argv)
       { NULL, 0, NULL, 0}
     };
 
-  while ( (c = getopt_long(argc, argv, "svb:", options, NULL)) != -1)
+  while ( (c = getopt_long(argc, argv, "svqb:", options, NULL)) != -1)
     switch (c)
       {
       case OPT_HELP: