diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 2a49f0871..88a73be31 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -64,4 +64,8 @@ module WikiHelper
       project_wiki_page_path(page.project, page.title)
     end
   end
+
+  def wiki_content_update_info(content)
+    l(:label_updated_time_by, :author => content.author.name, :age => distance_of_time_in_words(Time.now, content.updated_on)).html_safe
+  end
 end
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index c7d186176..a4de3e7eb 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -14,7 +14,6 @@
   <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') %>
 <% end %>
 <% end %>
-<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
 </div>
 
 <%= wiki_page_breadcrumb(@page) %>
@@ -67,6 +66,13 @@
 </div>
 </fieldset>
 
+<% if User.current.allowed_to?(:view_wiki_edits, @project) %>
+<p class="wiki-update-info">
+  <%= wiki_content_update_info(@content) %>
+ · <%= link_to l(:label_x_revisions, :count => @content.version), {:action => 'history', :id => @page.title} %>
+</p>
+<% end %>
+
 <% other_formats_links do |f| %>
   <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %>
   <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0dac83a06..3fb86c14c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -775,6 +775,7 @@ en:
   label_latest_revision_plural: Latest revisions
   label_view_revisions: View revisions
   label_view_all_revisions: View all revisions
+  label_x_revisions: "%{count} revisions"
   label_max_size: Maximum size
   label_sort_highest: Move to top
   label_sort_higher: Move up
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e029b5e04..11e0348c4 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -784,6 +784,7 @@ fr:
   label_latest_revision_plural: Dernières révisions
   label_view_revisions: Voir les révisions
   label_view_all_revisions: Voir toutes les révisions
+  label_x_revisions: "%{count} révisions"
   label_max_size: Taille maximale
   label_sort_highest: Remonter en premier
   label_sort_higher: Remonter
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 11a1d836b..cbd4bd6b2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -550,6 +550,8 @@ table#time-report .hours-dec { font-size: 0.9em; }
 div.wiki-page .contextual a {opacity: 0.4}
 div.wiki-page .contextual a:hover {opacity: 1}
 
+.wiki-update-info {text-align:right; color:#666; font-size:90%;}
+
 form .attributes select { width: 60%; }
 form .attributes select + a.icon-only { vertical-align: middle; margin-left: 4px; }
 input#issue_subject, input#document_title { width: 99%; }