1 files changed, 4 insertions, 1 deletions
diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs
index aca0a4241..55c3f724a 100644
--- a/src/Text/Pandoc/Writers/AsciiDoc.hs
+++ b/src/Text/Pandoc/Writers/AsciiDoc.hs
@@ -163,6 +163,7 @@ escapeString context t
   needsEscape '+' = True
   needsEscape '`' = True
   needsEscape '*' = True
+  needsEscape '#' = True
   needsEscape '_' = True
   needsEscape '<' = True
   needsEscape '>' = True
@@ -593,7 +594,9 @@ inlineListToAsciiDoc opts lst = do
                                    _           -> False
        isSpacy Start (Str xs)
          | Just (c, _) <- T.uncons xs = isPunctuation c || isSpace c
-       isSpacy _ _ = True
+       isSpacy End (Link{}) = True
+       isSpacy End (Image{}) = True
+       isSpacy _ _ = False
 
 setIntraword :: PandocMonad m => Bool -> ADW m ()
 setIntraword b = modify $ \st -> st{ intraword = b }