diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 5b7f23f794..3edf7b80bb 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -108,6 +108,11 @@
     </div>
 
     <div id="content">
+        <% if Setting.banner_text.present? %>
+            <div id="banner-text">
+                <%= textilizable Setting.banner_text %>
+            </div>
+        <% end %>
         <%= render_flash_messages %>
         <%= yield %>
         <%= call_hook :view_layouts_base_content %>
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 043067f180..0d729f3c1e 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -6,6 +6,8 @@
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
+<p><%= setting_text_area :banner_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings_banner_text' %>
 
 <p><%= setting_text_field :per_page_options, :size => 20 %>
 <em class="info"><%= l(:text_comma_separated) %></em></p>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e9352dd02a..41f18c2a37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -413,6 +413,7 @@ en:
 
   setting_app_title: Application title
   setting_welcome_text: Welcome text
+  setting_banner_text: Banner text
   setting_default_language: Default language
   setting_login_required: Authentication required
   setting_self_registration: Self-registration
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4104adea2c..8360bde953 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -347,6 +347,7 @@ ja:
 
   setting_app_title: アプリケーションのタイトル
   setting_welcome_text: ウェルカムメッセージ
+  setting_banner_text: バナーメッセージ
   setting_default_language: デフォルトの言語
   setting_login_required: 認証が必要
   setting_self_registration: ユーザーによるアカウント登録
diff --git a/config/settings.yml b/config/settings.yml
index 64209bdfd1..f7116d7f58 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -23,6 +23,8 @@ app_title:
   default: Redmine
 welcome_text:
   default:
+banner_text:
+  default:
 login_required:
   default: 0
   security_notifications: 1
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 791ef4c23d..13f37de43c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1127,6 +1127,16 @@ img.ui-datepicker-trigger {
   margin-left: 4px;
 }
 
+/***** Banner *****/
+
+div#banner-text {
+  padding: 0px 20px;
+  margin-bottom: 2px;
+  background-color: #eee;
+  border: 1px solid #ddd;
+  padding-left: 12px;
+}
+
 /***** Progress bar *****/
 table.progress {
   border-collapse: collapse;