diff --git a/data/templates/default.epub2 b/data/templates/default.epub2
index e57b420043b4..8a5aef14ef73 100644
--- a/data/templates/default.epub2
+++ b/data/templates/default.epub2
@@ -9,6 +9,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.epub3 b/data/templates/default.epub3
index 7fcbf1928784..f40f704f10ac 100644
--- a/data/templates/default.epub3
+++ b/data/templates/default.epub3
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.html4 b/data/templates/default.html4
index 8f422cf5f9ca..9745f3ba82e1 100644
--- a/data/templates/default.html4
+++ b/data/templates/default.html4
@@ -17,6 +17,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.html5 b/data/templates/default.html5
index 633764b3c24d..dfc66cf4e2ec 100644
--- a/data/templates/default.html5
+++ b/data/templates/default.html5
@@ -17,6 +17,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.revealjs b/data/templates/default.revealjs
index 92d81e3f106a..ac8d6c444789 100644
--- a/data/templates/default.revealjs
+++ b/data/templates/default.revealjs
@@ -20,6 +20,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.s5 b/data/templates/default.s5
index c3896af84ece..e4fa970d394c 100644
--- a/data/templates/default.s5
+++ b/data/templates/default.s5
@@ -18,6 +18,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.slideous b/data/templates/default.slideous
index 5f194703bbcf..c7dbb5969142 100644
--- a/data/templates/default.slideous
+++ b/data/templates/default.slideous
@@ -19,6 +19,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/data/templates/default.slidy b/data/templates/default.slidy
index cde6dd540d49..e7b3278ff3dd 100644
--- a/data/templates/default.slidy
+++ b/data/templates/default.slidy
@@ -19,6 +19,7 @@ $endif$
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
 $if(quotes)$
       q { quotes: "“" "”" "‘" "’"; }
 $endif$
diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs
index d56a6e4aef0e..9f41f77d1cec 100644
--- a/src/Text/Pandoc/Writers/HTML.hs
+++ b/src/Text/Pandoc/Writers/HTML.hs
@@ -600,7 +600,7 @@ blockToHtml opts (LineBlock lns) =
   else do
     let lf = preEscapedString "\n"
     htmlLines <- mconcat . intersperse lf <$> mapM (inlineListToHtml opts) lns
-    return $ H.div ! A.style "white-space: pre-line;" $ htmlLines
+    return $ H.div ! A.class_ "line-block" $ htmlLines
 blockToHtml opts (Div attr@(ident, classes, kvs) bs) = do
   html5 <- gets stHtml5
   let speakerNotes = "notes" `elem` classes
diff --git a/test/lhs-test.html b/test/lhs-test.html
index db90ae95e6bf..ff14e3699c40 100644
--- a/test/lhs-test.html
+++ b/test/lhs-test.html
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }
diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs
index d13aa36e3229..f0bfd0465802 100644
--- a/test/lhs-test.html+lhs
+++ b/test/lhs-test.html+lhs
@@ -8,6 +8,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <style type="text/css">
 div.sourceCode { overflow-x: auto; }
diff --git a/test/s5-basic.html b/test/s5-basic.html
index 4757910b9291..b559a9af6924 100644
--- a/test/s5-basic.html
+++ b/test/s5-basic.html
@@ -13,6 +13,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />
diff --git a/test/s5-fancy.html b/test/s5-fancy.html
index f80d321fbaee..a24baa556530 100644
--- a/test/s5-fancy.html
+++ b/test/s5-fancy.html
@@ -13,6 +13,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!-- configuration parameters -->
   <meta name="defaultView" content="slideshow" />
diff --git a/test/s5-inserts.html b/test/s5-inserts.html
index b84d2360e036..97c8de384052 100644
--- a/test/s5-inserts.html
+++ b/test/s5-inserts.html
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <link rel="stylesheet" href="main.css" type="text/css" />
   STUFF INSERTED
diff --git a/test/writer.html4 b/test/writer.html4
index ccd3af10c1f9..bac16b14c830 100644
--- a/test/writer.html4
+++ b/test/writer.html4
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
 </head>
 <body>
diff --git a/test/writer.html5 b/test/writer.html5
index f44de80e22d0..ee921766cdd6 100644
--- a/test/writer.html5
+++ b/test/writer.html5
@@ -11,6 +11,7 @@
   <style type="text/css">
       code{white-space: pre-wrap;}
       .smallcaps{font-variant: small-caps;}
+      .line-block{white-space: pre-line;}
   </style>
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>