d5fc66
diff --git a/doc/grep.in.1 b/doc/grep.in.1
d5fc66
index 40c9586..a4e89eb 100644
d5fc66
--- a/doc/grep.in.1
d5fc66
+++ b/doc/grep.in.1
d5fc66
@@ -335,7 +335,7 @@ Print
d5fc66
 .I NUM
d5fc66
 lines of trailing context after matching lines.
d5fc66
 Places a line containing a group separator
d5fc66
-.RB ( \-\^\- )
d5fc66
+.RB "(described under " \-\^\-group\-separator )
d5fc66
 between contiguous groups of matches.
d5fc66
 With the
d5fc66
 .B \-o
d5fc66
@@ -348,7 +348,7 @@ Print
d5fc66
 .I NUM
d5fc66
 lines of leading context before matching lines.
d5fc66
 Places a line containing a group separator
d5fc66
-.RB ( \-\^\- )
d5fc66
+.RB "(described under " \-\^\-group\-separator )
d5fc66
 between contiguous groups of matches.
d5fc66
 With the
d5fc66
 .B \-o
d5fc66
@@ -361,13 +361,24 @@ Print
d5fc66
 .I NUM
d5fc66
 lines of output context.
d5fc66
 Places a line containing a group separator
d5fc66
-.RB ( \-\^\- )
d5fc66
+.RB "(described under " \-\^\-group\-separator )
d5fc66
 between contiguous groups of matches.
d5fc66
 With the
d5fc66
 .B \-o
d5fc66
 or
d5fc66
 .B \-\^\-only\-matching
d5fc66
 option, this has no effect and a warning is given.
d5fc66
+.TP
d5fc66
+.BI \-\^\-group\-separator= SEP
d5fc66
+Use
d5fc66
+.I SEP
d5fc66
+as a group separator. By default
d5fc66
+.I SEP
d5fc66
+is double hyphen
d5fc66
+.RB ( \-\^\- ).
d5fc66
+.TP
d5fc66
+.B \-\^\-no\-group-separator
d5fc66
+Use empty string as a group separator.
d5fc66
 .SS "File and Directory Selection"
d5fc66
 .TP
d5fc66
 .BR \-a ", " \-\^\-text
d5fc66
diff --git a/src/grep.c b/src/grep.c
d5fc66
index 8d22aec..a2de03d 100644
d5fc66
--- a/src/grep.c
d5fc66
+++ b/src/grep.c
d5fc66
@@ -1986,6 +1986,8 @@ Context control:\n\
d5fc66
 "));
d5fc66
       printf (_("\
d5fc66
   -NUM                      same as --context=NUM\n\
d5fc66
+      --group-separator=SEP use SEP as a group separator\n\
d5fc66
+      --no-group-separator  use empty string as a group separator\n\
d5fc66
       --color[=WHEN],\n\
d5fc66
       --colour[=WHEN]       use markers to highlight the matching strings;\n\
d5fc66
                             WHEN is 'always', 'never', or 'auto'\n\