diff --git a/ChangeLog b/ChangeLog
index a8eb25457..13ecc98f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-08-25
+ChangeLog - 2006-08-26
 
 	
 Version 0.2.1 (under dev!):
+   * values yes/no accepted (as on/off) for config boolean values (task #5454)
    * added server default notify level (set by /buffer notify on server buffer)
      (task #5634)
    * fixed crashs with /buffer and /charset commands when not connected to any
diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c
index 08b293a45..663d4cb89 100644
--- a/src/common/weeconfig.c
+++ b/src/common/weeconfig.c
@@ -1348,9 +1348,11 @@ config_option_set_value (t_config_option *option, char *value)
     switch (option->option_type)
     {
         case OPTION_TYPE_BOOLEAN:
-            if (ascii_strcasecmp (value, "on") == 0)
+            if ((ascii_strcasecmp (value, "on") == 0)
+                || (ascii_strcasecmp (value, "yes") == 0))
                 *(option->ptr_int) = BOOL_TRUE;
-            else if (ascii_strcasecmp (value, "off") == 0)
+            else if ((ascii_strcasecmp (value, "off") == 0)
+                     || (ascii_strcasecmp (value, "no") == 0))
                 *(option->ptr_int) = BOOL_FALSE;
             else
                 return -1;
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index a8eb25457..13ecc98f5 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-08-25
+ChangeLog - 2006-08-26
 
 	
 Version 0.2.1 (under dev!):
+   * values yes/no accepted (as on/off) for config boolean values (task #5454)
    * added server default notify level (set by /buffer notify on server buffer)
      (task #5634)
    * fixed crashs with /buffer and /charset commands when not connected to any
diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c
index 08b293a45..663d4cb89 100644
--- a/weechat/src/common/weeconfig.c
+++ b/weechat/src/common/weeconfig.c
@@ -1348,9 +1348,11 @@ config_option_set_value (t_config_option *option, char *value)
     switch (option->option_type)
     {
         case OPTION_TYPE_BOOLEAN:
-            if (ascii_strcasecmp (value, "on") == 0)
+            if ((ascii_strcasecmp (value, "on") == 0)
+                || (ascii_strcasecmp (value, "yes") == 0))
                 *(option->ptr_int) = BOOL_TRUE;
-            else if (ascii_strcasecmp (value, "off") == 0)
+            else if ((ascii_strcasecmp (value, "off") == 0)
+                     || (ascii_strcasecmp (value, "no") == 0))
                 *(option->ptr_int) = BOOL_FALSE;
             else
                 return -1;