diff --git a/src/subcommand.rs b/src/subcommand.rs
index f7733fc2..5e7b7d21 100644
--- a/src/subcommand.rs
+++ b/src/subcommand.rs
@@ -566,26 +566,41 @@ impl Subcommand {
           .chain(aliases.get(recipe.name()).unwrap_or(&Vec::new()))
           .enumerate()
         {
-          print!(
-            "{}{}",
-            config.list_prefix.repeat(level + 1),
-            RecipeSignature { name, recipe }.color_display(config.color.stdout())
-          );
-
           let doc = if i == 0 {
             recipe.doc().map(Cow::Borrowed)
           } else {
             Some(Cow::Owned(format!("alias for `{}`", recipe.name)))
           };
 
+          if let Some(doc) = &doc {
+            if doc.lines().count() > 1 {
+              for line in doc.lines() {
+                println!(
+                  "{}{} {}",
+                  config.list_prefix.repeat(level + 1),
+                  config.color.stdout().doc().paint("#"),
+                  config.color.stdout().doc().paint(line),
+                );
+              }
+            }
+          }
+
+          print!(
+            "{}{}",
+            config.list_prefix.repeat(level + 1),
+            RecipeSignature { name, recipe }.color_display(config.color.stdout())
+          );
+
           if let Some(doc) = doc {
-            print!(
-              "{:padding$}{} {}",
-              "",
-              config.color.stdout().doc().paint("#"),
-              config.color.stdout().doc().paint(&doc),
-              padding = max_signature_width.saturating_sub(signature_widths[name]) + 1,
-            );
+            if doc.lines().count() <= 1 {
+              print!(
+                "{:padding$}{} {}",
+                "",
+                config.color.stdout().doc().paint("#"),
+                config.color.stdout().doc().paint(&doc),
+                padding = max_signature_width.saturating_sub(signature_widths[name]) + 1,
+              );
+            }
           }
           println!();
         }
diff --git a/tests/attributes.rs b/tests/attributes.rs
index d527b0ef..9c79bb77 100644
--- a/tests/attributes.rs
+++ b/tests/attributes.rs
@@ -156,11 +156,11 @@ fn doc_attribute_suppress() {
   Test::new()
     .justfile(
       "
-    # Non-document comment
-    [doc]
-    foo:
-      echo foo
-  ",
+        # Non-document comment
+        [doc]
+        foo:
+          echo foo
+      ",
     )
     .args(["--list"])
     .stdout(
@@ -171,3 +171,25 @@ fn doc_attribute_suppress() {
     )
     .run();
 }
+
+#[test]
+fn doc_multiline() {
+  Test::new()
+    .justfile(
+      "
+        [doc('multiline
+        comment')]
+        foo:
+      ",
+    )
+    .args(["--list"])
+    .stdout(
+      "
+    Available recipes:
+        # multiline
+        # comment
+        foo
+        ",
+    )
+    .run();
+}