diff --git a/Gemfile b/Gemfile
index 12d02d9..a69fcb0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'exception_notification', '2.4.1'
 gem 'gravtastic'
 gem 'ledermann-rails-settings', :require => 'rails-settings'
 gem 'json'
-gem 'haml', '<4.0'
+gem 'haml', '<6.0'
 gem 'nokogiri'
 gem 'omniauth'
 gem 'oa-oauth', :require => 'omniauth/oauth'
diff --git a/Gemfile.lock b/Gemfile.lock
index bf61a17..d6f0d27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,7 +102,9 @@ GEM
       multipart-post (~> 1.1)
       rack (~> 1.1)
     gravtastic (3.2.6)
-    haml (3.1.8)
+    haml (5.0.0)
+      temple (>= 0.8.0)
+      tilt
     hashie (2.0.5)
     hike (1.2.3)
     i18n (0.6.9)
@@ -221,6 +223,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    temple (0.8.2)
     thin (1.6.1)
       daemons (>= 1.0.9)
       eventmachine (>= 1.0.0)
@@ -258,7 +261,7 @@ DEPENDENCIES
   exception_notification (= 2.4.1)
   factory_girl_rails
   gravtastic
-  haml (< 4.0)
+  haml (< 6.0)
   jquery-rails
   jquery-ui-rails
   json