diff --git a/doc/grep.in.1 b/doc/grep.in.1

index f2d4362..f3e416b 100644

--- a/doc/grep.in.1

+++ b/doc/grep.in.1

@@ -377,7 +377,7 @@ Print

 .I NUM

 lines of trailing context after matching lines.

 Places a line containing a group separator

-.RB ( \-\^\- )

+.RB "(described under " \-\^\-group\-separator )

 between contiguous groups of matches.

 With the

 .B \-o

@@ -390,7 +390,7 @@ Print

 .I NUM

 lines of leading context before matching lines.

 Places a line containing a group separator

-.RB ( \-\^\- )

+.RB "(described under " \-\^\-group\-separator )

 between contiguous groups of matches.

 With the

 .B \-o

@@ -403,13 +403,24 @@ Print

 .I NUM

 lines of output context.

 Places a line containing a group separator

-.RB ( \-\^\- )

+.RB "(described under " \-\^\-group\-separator )

 between contiguous groups of matches.

 With the

 .B \-o

 or

 .B \-\^\-only\-matching

 option, this has no effect and a warning is given.

+.TP

+.BI \-\^\-group\-separator= SEP

+Use

+.I SEP

+as a group separator. By default

+.I SEP

+is double hyphen

+.RB ( \-\^\- ).

+.TP

+.B \-\^\-no\-group-separator

+Use empty string as a group separator.

 .SS "File and Directory Selection"

 .TP

 .BR \-a ", " \-\^\-text

diff --git a/src/main.c b/src/main.c

index e3b5186..145d6a1 100644

--- a/src/main.c

+++ b/src/main.c

@@ -1613,6 +1613,8 @@ Context control:\n\

 "));

       printf (_("\

   -NUM                      same as --context=NUM\n\

+      --group-separator=SEP use SEP as a group separator\n\

+      --no-group-separator  use empty string as a group separator\n\

       --color[=WHEN],\n\

       --colour[=WHEN]       use markers to highlight the matching strings;\n\

                             WHEN is 'always', 'never', or 'auto'\n\