diff --git a/ChangeLog b/ChangeLog
index a8401b6c5638f58c893e8f66410fab2408bf88be..2883a1e261956242f4bf888a24a2bb3085610f55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-22  Niels M�ller  <nisse@turmalin.hack.org>
+
+	* examples/nettle-benchmark.c (main): Added long options. Deleted -?,
+	and fixed handling of bad options.
+
+	* examples/eratosthenes.c (main): Added long options. Deleted -?,
+	and fixed handling of bad options. Renamed -s to -q (long option
+	--quiet). 
+
+	* tools/pkcs1-conv.c (main): Deleted short alias -? for --help,
+	and fixed handling of bad options.
+	* tools/sexp-conv.c (parse_options): Likewise.
+
 2010-10-06  Niels M�ller  <nisse@turmalin.hack.org>
 
 	* memxor.c (memxor3): Optimized.