diff --git a/src/Main.hs b/src/Main.hs
index 3272463dc..a60ca4c33 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -447,7 +447,8 @@ main = do
          defaultParserState { stateParseRaw    = parseRaw,
                               stateTabStop     = tabStop, 
                               stateStandalone  = standalone && (not strict),
-                              stateSmart       = smart || writerName' == "latex",
+                              stateSmart       = smart || writerName' `elem` 
+                                                          ["latex", "context"],
                               stateColumns     = columns,
                               stateStrict      = strict }
   let csslink = if (css == "")
diff --git a/web/demos b/web/demos
index a47709bf6..5ce02ccea 100644
--- a/web/demos
+++ b/web/demos
@@ -49,7 +49,7 @@ click on the name of the output file:
 
 12. ConTeXt:
 
-@   pandoc -s -S -w context README -o example12.tex
+@   pandoc -s -w context README -o example12.tex
 
 13. PDF via pandoc and ConTeXt's `texexec`: