diff --git a/rc/filetype/asciidoc.kak b/rc/filetype/asciidoc.kak
index 3aa3676c..72ca3612 100644
--- a/rc/filetype/asciidoc.kak
+++ b/rc/filetype/asciidoc.kak
@@ -33,6 +33,9 @@ add-highlighter shared/asciidoc/ regex (\A|\n\n)[^\n]+\n\^{2,}\h*$ 0:header
 add-highlighter shared/asciidoc/ regex (\A|\n\n)=\h+[^\n]+$ 0:title
 add-highlighter shared/asciidoc/ regex (\A|\n\n)={2,}\h+[^\n]+$ 0:header
 
+add-highlighter shared/asciidoc/ regex ^//(?:[^\n/][^\n]*|)$ 0:comment
+add-highlighter shared/asciidoc/ regex ^(/{4,}).*?\n(/{4,})$ 0:comment
+
 add-highlighter shared/asciidoc/ regex ^\h+([-\*])\h+[^\n]*(\n\h+[^-\*]\S+[^\n]*)*$ 0:list 1:bullet
 add-highlighter shared/asciidoc/ regex ^(-{3,})\n[^\n\h].*?\n(-{3,})$ 0:block
 add-highlighter shared/asciidoc/ regex ^(={3,})\n[^\n\h].*?\n(={3,})$ 0:block
diff --git a/rc/tools/comment.kak b/rc/tools/comment.kak
index ac25b4ce..4560de16 100644
--- a/rc/tools/comment.kak
+++ b/rc/tools/comment.kak
@@ -10,8 +10,9 @@ declare-option -docstring "characters inserted after a commented block" \
 
 # Default comments for all languages
 hook global BufSetOption filetype=asciidoc %{
-    set-option buffer comment_block_begin '///'
-    set-option buffer comment_block_end '///'
+    set-option buffer comment_line '//'
+    set-option buffer comment_block_begin '////'
+    set-option buffer comment_block_end '////'
 }
 
 hook global BufSetOption filetype=(c|cpp|dart|gluon|go|java|javascript|objc|php|rust|sass|scala|scss|swift|typescript) %{