diff --git a/Gemfile b/Gemfile
index 1ce660b8..45265fae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'rails', '= 4.0.13'
 #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
 gem 'mysql2', '>= 0.3.11'
 
-gem 'haml', '~> 4.0.0'
+gem 'haml', '~> 6.1', '>= 6.1.1'
 gem 'rdiscount', '~> 1.6.5'
 gem 'will_paginate', '~> 3.0.pre2'
 gem 'devise', '~> 3.5.10'
diff --git a/Gemfile.lock b/Gemfile.lock
index 032ed0e0..93cd1f65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -112,7 +112,9 @@ GEM
     globalize (4.0.3)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
-    haml (4.0.6)
+    haml (6.1.1)
+      temple (>= 0.8.2)
+      thor
       tilt
     highline (1.7.2)
     hike (1.2.3)
@@ -244,6 +246,7 @@ GEM
     ssrf_filter (1.0.8)
     subexec (0.2.3)
     swf_converter (0.0.3)
+    temple (0.8.2)
     thor (1.2.2)
     thread_safe (0.3.6)
     tilt (1.4.1)
@@ -277,7 +280,7 @@ DEPENDENCIES
   factory_girl_rails (~> 1.0)
   fog (~> 1.8.0)
   globalize (~> 4.0.3)
-  haml (~> 4.0.0)
+  haml (~> 6.1, >= 6.1.1)
   http_accept_language!
   letter_opener
   memcache-client (~> 1.8.5)
diff --git a/vendor/cache/haml-4.0.6.gem b/vendor/cache/haml-4.0.6.gem
deleted file mode 100644
index a8e76974..00000000
Binary files a/vendor/cache/haml-4.0.6.gem and /dev/null differ
diff --git a/vendor/cache/haml-6.1.1.gem b/vendor/cache/haml-6.1.1.gem
new file mode 100644
index 00000000..e7aa183f
Binary files /dev/null and b/vendor/cache/haml-6.1.1.gem differ
diff --git a/vendor/cache/temple-0.8.2.gem b/vendor/cache/temple-0.8.2.gem
new file mode 100644
index 00000000..85f7205b
Binary files /dev/null and b/vendor/cache/temple-0.8.2.gem differ