2 files changed, 31 insertions, 4 deletions
diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs
index af7ec6e43..96c4fd15d 100644
--- a/src/Text/Pandoc/Writers/Markdown.hs
+++ b/src/Text/Pandoc/Writers/Markdown.hs
@@ -219,20 +219,28 @@ blockToMarkdown opts (Table caption aligns widths headers rows) =  do
           else map (floor . (78 *)) widths
   let makeRow = hsepBlocks . (zipWith alignHeader aligns) . 
                 (zipWith docToBlock widthsInChars)
-  let head' = makeRow headers'
   let rows' = map makeRow rawRows
+  let head' = makeRow headers'
   let maxRowHeight = maximum $ map heightOfBlock (head':rows')
   let underline = hsep $ 
                   map (\width -> text $ replicate width '-') widthsInChars
   let border = if maxRowHeight > 1
                   then text $ replicate (sum widthsInChars + (length widthsInChars - 1)) '-'
-                  else empty
+                  else if all null headers
+                          then underline
+                          else empty
+  let head'' = if all null headers
+                  then empty
+                  else border $+$ blockToDoc head'
   let spacer = if maxRowHeight > 1
                   then text ""
                   else empty
   let body = vcat $ intersperse spacer $ map blockToDoc rows'
-  return $ (nest 2 $ border $+$ (blockToDoc head') $+$ underline $+$ body $+$ 
-                     border $+$ caption'') <> text "\n"
+  let bottom = if all null headers
+                  then underline
+                  else border
+  return $ (nest 2 $ head'' $+$ underline $+$ body $+$ 
+                     bottom $+$ caption'') <> text "\n"
 blockToMarkdown opts (BulletList items) = do
   contents <- mapM (bulletListItemToMarkdown opts) items
   return $ (vcat contents) <> text "\n"
diff --git a/tests/tables.markdown b/tests/tables.markdown
index 4e05cdc35..a605137d1 100644
--- a/tests/tables.markdown
+++ b/tests/tables.markdown
@@ -56,5 +56,24 @@ Multiline table without caption:
                                       rows.
   --------------------------------------------------------------
 
+Table without column headers:
+
+  ----- ----- ----- -----
+     12 12     12      12
+    123 123    123    123
+      1 1       1       1
+  ----- ----- ----- -----
+
+Multiline table without column headers:
+
+  ----------- ---------- ------------ --------------------------
+     First    row                12.0 Example of a row that
+                                      spans multiple lines.
+  
+    Second    row                 5.0 Here's another one. Note
+                                      the blank line between
+                                      rows.
+  ----------- ---------- ------------ --------------------------
+