diff --git a/src/ChangeLog b/src/ChangeLog
index 989106dd..18dfa9b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-16  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* init.c (cmd_lockable_boolean): Improve the error message so it
+	lists the more useful values first.
+
 2005-06-15  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* http.c (gethttp): Also report the system error when the POST
diff --git a/src/init.c b/src/init.c
index b6347aa5..b0e2c592 100644
--- a/src/init.c
+++ b/src/init.c
@@ -747,7 +747,7 @@ cmd_lockable_boolean (const char *com, const char *val, void *place)
   else
     {
       fprintf (stderr,
-	       _("%s: %s: Invalid boolean `%s', use always, on, off, or never.\n"),
+	       _("%s: %s: Invalid boolean `%s'; use on, off, always, or never.\n"),
 	       exec_name, com, val);
       return 0;
     }