diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index ce5d06826..28bffef2d 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -130,7 +130,7 @@ pandocToLaTeX options (Pandoc (Meta title authors date) blocks) = do
                  [ ("lhs", "yes") | stLHS st ] ++
                  [ ("graphics", "yes") | stGraphics st ] ++
                  [ ("book-class", "yes") | stBook st] ++
-                 [ ("listings", "yes") | writerListings options ] ++
+                 [ ("listings", "yes") | writerListings options || stLHS st ] ++
                  [ ("highlighting-macros", defaultLaTeXMacros) | stHighlighting st ] ++
                  citecontext
   return $ if writerStandalone options
diff --git a/templates b/templates
index ac3ddfed9..0d116481c 160000
--- a/templates
+++ b/templates
@@ -1 +1 @@
-Subproject commit ac3ddfed96bc2ff5b6ff0b7fce49a35a02b227dc
+Subproject commit 0d116481c0902181c6b90827a0451570a133de39