diff --git a/src/flextype/dependencies.php b/src/flextype/dependencies.php
index 261b884c..cb2adb1d 100644
--- a/src/flextype/dependencies.php
+++ b/src/flextype/dependencies.php
@@ -222,6 +222,10 @@ flextype()->container()['markdown'] = static function () {
     return new Markdown(new ParsedownExtra());
 };
 
+flextype('markdown')->getInstance()->setBreaksEnabled(flextype('registry')->get('flextype.settings.markdown.auto_line_breaks'));
+flextype('markdown')->getInstance()->setUrlsLinked(flextype('registry')->get('flextype.settings.markdown.auto_url_links'));
+flextype('markdown')->getInstance()->setMarkupEscaped(flextype('registry')->get('flextype.settings.markdown.escape_markup'));
+
 /**
  * Add json serializer service to Flextype container
  */
diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index 280bddf2..7333d280 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -323,6 +323,16 @@ slugify:
 image:
   driver: gd
 
+# Markdown
+#
+# - markdown.auto_line_breaks: Enable automatic line breaks
+# - markdown.auto_url_links:   Enable automatic HTML links
+# - markdown.escape_markup:    Escape markup tags into entities
+markdown:
+  auto_line_breaks: false
+  auto_url_links: false
+  escape_markup: false
+
 # Shortcode
 #
 # - shortcodes: Flextype Shortcodes to load.