diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 054bac8a..4d698a23 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -783,6 +783,10 @@ module ApplicationHelper
     end
   end
 
+  def favicon
+    "<link rel='shortcut icon' href='#{Redmine::Utils.relative_url_root}/favicon.ico' />"
+  end
+
   private
 
   def wiki_helper
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 1873191c..9521457d 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -5,6 +5,7 @@
 <title><%=h html_title %></title>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
+<%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
 <%= javascript_include_tag :defaults %>
 <%= heads_for_wiki_formatter %>