diff --git a/Gemfile b/Gemfile
index a1d627a356aa..33337ab9e3fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ group :development do
   gem 'pygments.rb', '~> 0.6.3'
   gem 'rdiscount', '~> 2.0'
   gem 'RedCloth', '~> 4.2'
-  gem 'haml', '~> 4.0'
+  gem 'haml', '~> 6.1'
   gem 'compass', '~> 0.12'
   gem 'sass-globbing', '~> 1.0'
   gem 'rubypants', '~> 0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index a64797568a6c..2d139de5df5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,9 @@ GEM
     ffi (1.9.14)
     forwardable-extended (2.6.0)
     fssm (0.2.10)
-    haml (4.0.7)
+    haml (6.1.1)
+      temple (>= 0.8.2)
+      thor
       tilt
     jekyll (3.2.1)
       colorator (~> 1.0)
@@ -102,10 +104,12 @@ GEM
       tilt (>= 1.3, < 3)
     slop (3.6.0)
     stringex (1.5.1)
+    temple (0.9.1)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    tilt (2.0.5)
+    thor (1.2.1)
+    tilt (2.0.11)
     titlecase (0.1.1)
     yajl-ruby (1.2.1)
 
@@ -117,7 +121,7 @@ DEPENDENCIES
   coderay
   compass (~> 0.12)
   execjs
-  haml (~> 4.0)
+  haml (~> 6.1)
   jekyll (~> 3.0)
   jekyll-paginate
   jekyll-redirect-from