diff --git a/Gemfile b/Gemfile
index 87f042e6a8..aa0f935655 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem "middleman-syntax"
 ## Template engines
 gem "builder"
 gem "haml", "~> 6.3"
-gem "kramdown"
+gem "kramdown-parser-gfm"
 
 # Rake tasks
 gem "rake"
diff --git a/Gemfile.lock b/Gemfile.lock
index dfe87263a6..a00cd1fc48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -251,7 +251,7 @@ DEPENDENCIES
   haml (~> 6.3)
   haml_lint (~> 0.59)
   irb
-  kramdown
+  kramdown-parser-gfm
   middleman!
   middleman-blog!
   middleman-search!
diff --git a/config.rb b/config.rb
index 6ee2cf6e51..b136d84834 100644
--- a/config.rb
+++ b/config.rb
@@ -27,6 +27,7 @@
 
 # Markdown extentions
 set :markdown,
+    input: "GFM",
     autolink: true,
     fenced_code_blocks: true,
     footnotes: true,