diff --git a/src/Raku/Actions.nqp b/src/Raku/Actions.nqp
index e705614338b..81097892ae9 100644
--- a/src/Raku/Actions.nqp
+++ b/src/Raku/Actions.nqp
@@ -2787,6 +2787,24 @@ class Raku::Actions is HLL::Actions does Raku::CommonActions {
         $*CU.replace-finish-content(~$<finish>);
     }
 
+    method doc-block:sym<comment>($/) {
+        if $*FROM-SEEN{$/.from}++ {
+            return;
+        }
+
+        my $config := extract-config($/);
+
+        my @paragraphs;
+        if $<lines> -> $lines {
+            if ~$lines -> $text {
+                nqp::push(@paragraphs,$text);
+            }
+        }
+
+        $*SEEN{$/.from} := RakuAST::Doc::Block.from-paragraphs:
+          :type<comment>, :$config, :@paragraphs;
+    }
+
     method doc-block:sym<begin>($/) {
         if $*FROM-SEEN{$/.from}++ {
             return;
diff --git a/src/Raku/Grammar.nqp b/src/Raku/Grammar.nqp
index 174731160bd..186ade177e8 100644
--- a/src/Raku/Grammar.nqp
+++ b/src/Raku/Grammar.nqp
@@ -3569,6 +3569,7 @@ if $*COMPILING_CORE_SETTING {
 
     proto token doc-block {*}
 
+    # handle =finish and friends
     token doc-block:sym<finish> {
         ^^ \h*
         [
@@ -3579,6 +3580,23 @@ if $*COMPILING_CORE_SETTING {
         $<finish> = .*
     }
 
+    # handle =begin comment
+    token doc-block:sym<comment> {
+
+        # save any leading whitespace from start of line
+        ^^ $<spaces>=[ \h* ]
+
+        # start of 'begin comment' block
+        '=begin' \h+ 'comment' <doc-configuration($<spaces>)>* <doc-newline>+
+
+        # fetch all non-empty lines, *NOT* looking at =pod markers
+        $<lines>=[^^ \h* \N+ \n?]*?
+
+        # until the matching end block
+        ^^ $<spaces> '=end' \h+ 'comment' [<doc-newline> | $]
+    }
+
+    # handle all the other =begin
     token doc-block:sym<begin> {
 
         # save any leading whitespace from start of line
@@ -3605,7 +3623,7 @@ if $*COMPILING_CORE_SETTING {
         # should now be at end of line
         <.doc-newline>+
 
-        # get any content
+        # get any doc blocks
         <doc-content>*
 
         # until the end marker