diff --git a/app/assets/javascripts/app/pages/admin_pods.js b/app/assets/javascripts/app/pages/admin_pods.js
index a4880354e..27fb1979e 100644
--- a/app/assets/javascripts/app/pages/admin_pods.js
+++ b/app/assets/javascripts/app/pages/admin_pods.js
@@ -30,17 +30,17 @@ app.pages.AdminPods = app.views.Base.extend({
   _showMessages: function() {
     var msgs = document.createDocumentFragment();
     if( gon.uncheckedCount && gon.uncheckedCount > 0 ) {
-      var unchecked = $("<div class='alert alert-info' />")
+      var unchecked = $("<div class='alert alert-info' role='alert' />")
         .append(Diaspora.I18n.t("admin.pods.unchecked", {count: gon.uncheckedCount}));
       msgs.appendChild(unchecked[0]);
     }
     if( gon.versionFailedCount && gon.versionFailedCount > 0 ) {
-      var versionFailed = $("<div class='alert alert-warning' />")
+      var versionFailed = $("<div class='alert alert-warning' role='alert' />")
           .append(Diaspora.I18n.t("admin.pods.version_failed", {count: gon.versionFailedCount}));
       msgs.appendChild(versionFailed[0]);
     }
     if( gon.errorCount && gon.errorCount > 0 ) {
-      var errors = $("<div class='alert alert-danger' />")
+      var errors = $("<div class='alert alert-danger' role='alert' />")
         .append(Diaspora.I18n.t("admin.pods.errors", {count: gon.errorCount}));
         msgs.appendChild(errors[0]);
     }
diff --git a/app/assets/templates/flash_messages_tpl.jst.hbs b/app/assets/templates/flash_messages_tpl.jst.hbs
index 109987147..1a8fe6fa0 100644
--- a/app/assets/templates/flash_messages_tpl.jst.hbs
+++ b/app/assets/templates/flash_messages_tpl.jst.hbs
@@ -1,5 +1,5 @@
 <div class="flash-body expose">
-  <div class="flash-message alert {{ alertLevel }}">
+  <div class="flash-message alert {{ alertLevel }}" role="alert">
     {{ message }}
   </div>
 </div>
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 3dab764f7..548ef2082 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -69,7 +69,7 @@ module LayoutHelper
     flash.map do |name, msg|
       klass = flash_class name
       content_tag(:div, msg, class: "flash-body expose") do
-        content_tag(:div, msg, class: "flash-message message alert alert-#{klass}")
+        content_tag(:div, msg, class: "flash-message message alert alert-#{klass}", role: "alert")
       end
     end.join(' ').html_safe
   end
diff --git a/app/views/admins/stats.html.haml b/app/views/admins/stats.html.haml
index c3ce51c3a..8f9082ef6 100644
--- a/app/views/admins/stats.html.haml
+++ b/app/views/admins/stats.html.haml
@@ -44,7 +44,7 @@
 
       .row
         .col-md-12
-          %p.alert.alert-info.text-center
+          %p.alert.alert-info.text-center{role: "alert"}
             != t('.current_segment', :post_yest => @posts[:yesterday]/@user_count.to_f, :post_day => @posts[:day_before]/@user_count.to_f)
 
       .row
diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml
index 52638f4d1..4be69152f 100644
--- a/app/views/admins/user_search.html.haml
+++ b/app/views/admins/user_search.html.haml
@@ -50,7 +50,8 @@
 
       .row
         .col-md-12
-          .alert.alert-info.text-center= t('.users', :count => @users.count)
+          .alert.alert-info.text-center{role: "alert"}
+            = t(".users", count: @users.count)
 
       .row
         .users.col-md-12
diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
index 3b6eee1ee..efec569c9 100644
--- a/app/views/registrations/new.mobile.haml
+++ b/app/views/registrations/new.mobile.haml
@@ -5,7 +5,7 @@
 .stream#main_stream
   - flash.each do |name, msg|
     .expose#flash-container
-      .flash-message{class: "message alert alert-#{flash_class name}"}
+      .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
         = msg
 
   #login_form
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index 4c72aaaa5..a4b7d803c 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -5,7 +5,7 @@
 .stream#main_stream
   - flash.each do |name, msg|
     .expose#flash-container
-      .flash-message{class: "message alert alert-#{flash_class name}"}
+      .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
         = msg
 
   #login_form