diff --git a/CommandArgs.hs b/CommandArgs.hs
--- a/CommandArgs.hs
+++ b/CommandArgs.hs
@@ -18,7 +18,7 @@
 deriving instance Data WrapMode
 deriving instance Typeable WrapMode
 
-programVersion = "0.28.0.3"
+programVersion = "0.28.0.4"
 
 data OutputFormat = OutputPHP
                   | OutputJavascript
diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -65,8 +65,10 @@
     let reader = getReader cmdargs filename filename
         write = getWriter cmdargs templateName
     rundata <- (roundTripYaml $ caRunData cmdargs)
-    let pre = "{%with " ++ rundata ++ " %}\n"
-        post = "{%endwith%}\n"
+    let flavor = getFlavor cmdargs
+        (tagO, tagC) = pfTagMarkers flavor
+        pre = tagO ++ "with " ++ rundata ++ " " ++ tagC ++ "\n"
+        post = tagO ++ "endwith" ++ tagC ++ "\n"
         src' = if null rundata
                     then src
                     else pre ++ src ++ post
@@ -92,17 +94,20 @@
 outputFormatExtension RunInterpreted = ""
 outputFormatExtension ListDependencies = "dep"
 
+getFlavor :: CommandArgs -> PacoFlavor
+getFlavor cmdargs =
+    case caPacoFlavor cmdargs of
+        Default -> defaultPacoFlavor
+        Jinja -> jinjaPacoFlavor
+        CSS -> cssPacoFlavor
+
 getReader :: CommandArgs -> FilePath -> Reader
 getReader cmdargs filePath =
     case getEffectiveInputLanguage cmdargs filePath of
         Paco -> readPaco' flavor
         Capo -> readCapo' flavor
     where
-        flavor =
-            case caPacoFlavor cmdargs of
-                Default -> defaultPacoFlavor
-                Jinja -> jinjaPacoFlavor
-                CSS -> cssPacoFlavor
+        flavor = getFlavor cmdargs
 
 getEffectiveInputLanguage :: CommandArgs -> FilePath -> InputLanguage
 getEffectiveInputLanguage cmdargs filePath =
diff --git a/hpaco.cabal b/hpaco.cabal
--- a/hpaco.cabal
+++ b/hpaco.cabal
@@ -1,5 +1,5 @@
 name:                hpaco
-version:             0.28.0.3
+version:             0.28.0.4
 synopsis:            Modular template compiler
 description:         CLI front-end to the hpaco-lib library. Compiles Paco
                      template source code to JavaScript or PHP, or interprets
@@ -20,7 +20,7 @@
   build-depends:       base == 4.*
                ,       filepath >= 1.1 && < 1.4
                ,       cmdargs >= 0.9 && < 1.0
-               , hpaco-lib >= 0.28.0.3
+               , hpaco-lib >= 0.28.0.4
                ,       strict >= 0.3
                ,       yaml >= 0.6
                ,       aeson >= 0.6