diff --git a/config.toml b/config.toml
index 5f46294bf..77e8770bb 100644
--- a/config.toml
+++ b/config.toml
@@ -58,14 +58,6 @@ pattern = "2006"
 [social]
 twitter = "GoHugoIO"
 
-# MARKDOWN
-## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday
-[blackfriday]
-	plainIDAnchors = true
-  # See https://github.com/gohugoio/hugo/issues/2424
-	hrefTargetBlank = false
-  angledQuotes = false
-  latexDashes = true
 
 [imaging]
 # See https://github.com/disintegration/imaging
diff --git a/config/_default/config.toml b/config/_default/config.toml
index ec0a08f56..81b712c0a 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -14,12 +14,6 @@ pluralizeListTitles = false
 # We do redirects via Netlify's _redirects file, generated by Hugo (see "outputs" below).
 disableAliases = true
 
-[markup]
-[markup.highlight]
-style = "trac"
-lineNumbersInTable = true
-noClasses = false
-
 [outputs]
 home = [ "HTML", "RSS", "REDIR", "HEADERS" ]
 section = [ "HTML", "RSS"]
diff --git a/config/_default/markup.toml b/config/_default/markup.toml
new file mode 100644
index 000000000..f237f3526
--- /dev/null
+++ b/config/_default/markup.toml
@@ -0,0 +1,7 @@
+defaultMarkdownHandler = "goldmark"
+
+[highlight]
+style = "trac"
+lineNumbersInTable = true
+noClasses = false
+