diff --git a/docs/help/in/hilight.in b/docs/help/in/hilight.in
index 2d084fad..a38d10c9 100644
--- a/docs/help/in/hilight.in
+++ b/docs/help/in/hilight.in
@@ -3,9 +3,10 @@
 
    -mask: Match only for nick, <text> is a nick mask
    -regexp: <text> is a regular expression
-   -word: <text> must match to full words
+   -full: <text> must match to full words
    -nick: Hilight only the nick, not the whole line (default)
-   -nonick: Hilight the whole line with the hilight color.
+   -word: Hilight only the word (default with non-public messages)
+   -line: Hilight the whole line with the hilight color.
    -color: Print the message with <color>. color is in %code format
            (see docs/formats.txt)
    -level: Match only for <level> messages, default is
diff --git a/src/fe-common/core/hilight-text.c b/src/fe-common/core/hilight-text.c
index 80ca2d03..197957f6 100644
--- a/src/fe-common/core/hilight-text.c
+++ b/src/fe-common/core/hilight-text.c
@@ -474,7 +474,7 @@ static void hilight_print(int index, HILIGHT_REC *rec)
 		    chans != NULL ? chans : "",
 		    levelstr != NULL ? levelstr : "",
 		    rec->nickmask ? " -mask" : "",
-		    rec->fullword ? " -word" : "",
+		    rec->fullword ? " -full" : "",
 		    rec->regexp ? " -regexp" : "");
 	g_free_not_null(chans);
 	g_free_not_null(levelstr);
@@ -563,7 +563,7 @@ static void cmd_hilight(const char *data)
                 rec->nick = TRUE;
 
 	rec->nickmask = g_hash_table_lookup(optlist, "mask") != NULL;
-	rec->fullword = g_hash_table_lookup(optlist, "word") != NULL;
+	rec->fullword = g_hash_table_lookup(optlist, "full") != NULL;
 	rec->regexp = g_hash_table_lookup(optlist, "regexp") != NULL;
 
 	if (colorarg != NULL) {