diff --git a/src/Main.hs b/src/Main.hs
index 8adef253a..84fa0d9dd 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -161,7 +161,10 @@ postEntry acid = do
     getLang "en" = return EN
 
 entryEscape :: Text -> Text
-entryEscape = T.replace "\n" "<br>"
+entryEscape = newlineEscape . newlineRNEscape
+  where
+    newlineEscape = T.replace "\n" "<br>"
+    newlineRNEscape = T.replace "\r\n" "<br>"
 
 entryList :: AcidState Blog -> BlogLang -> ServerPart Response
 entryList acid lang = do