diff --git a/ChangeLog b/ChangeLog
index 593022d..bf48049 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-17  Arnaud Cornet <arnaud.cornet@gmail.com>
+
+	* src/lex.l: Uniformize backlog options with backlog_ prefix.
+	* bip.conf.1: Update bip.conf doc.
+
 2007-01-01  Arnaud Cornet <arnaud.cornet@gmail.com>
 
 	* src/connection.c: Fix fd leak.
diff --git a/bip.conf.1 b/bip.conf.1
index ca8a802..c9cdf0e 100644
--- a/bip.conf.1
+++ b/bip.conf.1
@@ -62,7 +62,7 @@ also find an example configuration file along with BIP.
 .SH GLOBAL OPTIONS
 
 .TP
-\fBalways_backlog\fP (default: \fBfalse\fP)
+\fBbacklog_always\fP (default: \fBfalse\fP)
 If true, clients will always receive \fBbacklog_lines\fP log lines, even if
 they were already sent before. This option should of course not be enabled if
 \fBbacklog_lines\fP is 0 !
@@ -85,14 +85,14 @@ Coyote's.
 If true, backlogged line won't include the timestamp.
 
 .TP
-\fBblreset_on_talk\fP (default: \fBfalse\fP)
+\fBbacklog_reset_on_talk\fP (default: \fBfalse\fP)
 When true, backlog will not be reset upon client disconnection but upon client
 talk (channel/private message or action).  It means that next time you log to
 your bip session the backlogging will start at the time right after your last
 words on irc.
 
 .TP
-\fBbl_msg_only\fP (default: \fBfalse\fP)
+\fBbacklog_msg_only\fP (default: \fBfalse\fP)
 When true, bip will backlog only channel/private messages/notices. No topic
 change, nick change, user quit/part/join will be backlogged upon connection.
 
diff --git a/samples/bip.conf b/samples/bip.conf
index 8e4ecc9..cc5dc0b 100644
--- a/samples/bip.conf
+++ b/samples/bip.conf
@@ -39,7 +39,7 @@ log_level = 3;
 # you were not connected to the proxy upon connection. 
 #backlog = true;		# enable backlog
 backlog_lines = 10;		# number of lines in backlog, 0 means no limit
-always_backlog = true;		# backlog even lines already backlogged
+backlog_always = true;		# backlog even lines already backlogged
 #backlog_no_timestamp = false;  # Disables time stamps if you find them ugly.
 
 # If blreset_on_talk talking on an irc network has the same effect of issuing
@@ -50,7 +50,7 @@ always_backlog = true;		# backlog even lines already backlogged
 # If bl_msg_only is true, only channel and private messages will be backlogged
 # upon the reconnection of a client. Default is false, thus joins, parts, quits,
 # nick changes, topic changes, ... are backlogged
-#bl_msg_only = false;
+#backlog_msg_only = false;
 
 # Network definition, a name and server info
 network {
diff --git a/src/lex.l b/src/lex.l
index f61a9e7..795b297 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -83,9 +83,13 @@ list_t *parse_conf(FILE *file)
 "backlog_lines"		{ return LEX_BACKLOG_LINES; }
 "backlog_no_timestamp"	{ return LEX_BACKLOG_NO_TIMESTAMP; }
 "backlog"		{ return LEX_BACKLOG; }
+"backlog_always"	{ return LEX_ALWAYS_BACKLOG; }
+"backlog_msg_only"	{ return LEX_BL_MSG_ONLY; }
+"backlog_reset_on_talk"	{ return LEX_BLRESET_ON_TALK; }
+"blreset_on_talk"	{ return LEX_BLRESET_ON_TALK; }
 "bl_msg_only"		{ return LEX_BL_MSG_ONLY; }
-"log"			{ return LEX_LOG; }
 "always_backlog"	{ return LEX_ALWAYS_BACKLOG; }
+"log"			{ return LEX_LOG; }
 "log_sync_interval"	{ return LEX_LOG_SYNC_INTERVAL; }
 "follow_nick"		{ return LEX_FOLLOW_NICK; }
 "ignore_first_nick"	{ return LEX_IGN_FIRST_NICK; }