diff --git a/app/assets/stylesheets/common/020_base.css.scss b/app/assets/stylesheets/common/020_base.css.scss
index 266cf479a..e54da8b6c 100644
--- a/app/assets/stylesheets/common/020_base.css.scss
+++ b/app/assets/stylesheets/common/020_base.css.scss
@@ -117,3 +117,8 @@ strong {
 table tfoot {
   margin-top: 2em;
 }
+
+.hint {
+  color: #666;
+  font-style: italic;
+}
diff --git a/app/assets/stylesheets/common/simple_form.css.scss b/app/assets/stylesheets/common/simple_form.css.scss
index 08b74673d..5fc1ac121 100644
--- a/app/assets/stylesheets/common/simple_form.css.scss
+++ b/app/assets/stylesheets/common/simple_form.css.scss
@@ -28,11 +28,6 @@ form.simple_form {
       line-height: 1.5em;
     }
     
-    .hint {
-      color: #666;
-      font-style: italic;
-    }
-    
     fieldset {
       border: none;
       display: inline;
diff --git a/app/assets/stylesheets/specific/artists.css.scss b/app/assets/stylesheets/specific/artists.css.scss
index ed2ccb903..2a31a2f02 100644
--- a/app/assets/stylesheets/specific/artists.css.scss
+++ b/app/assets/stylesheets/specific/artists.css.scss
@@ -36,7 +36,6 @@ div#c-artists {
   }
   
   .hint {
-    font-size: 80%;
     display: block;
   }
 }
diff --git a/app/presenters/wiki_page_presenter.rb b/app/presenters/wiki_page_presenter.rb
index b7ebac21f..bc14d780b 100644
--- a/app/presenters/wiki_page_presenter.rb
+++ b/app/presenters/wiki_page_presenter.rb
@@ -13,6 +13,14 @@ class WikiPagePresenter
     excerpt.try(:gsub, /<.+?>/, "")
   end
   
+  def consequent_tag_aliases
+    @consequent_tag_aliases ||= TagAlias.where("consequent_name = ?", wiki_page.title)
+  end
+  
+  def antecedent_tag_alias
+    @antecedent_tag_alias ||= TagAlias.find_by_antecedent_name(wiki_page.title)
+  end
+  
   # Produce a formatted page that shows the difference between two versions of a page.
   def diff(other_version)
     pattern = Regexp.new('(?:<.+?>)|(?:[0-9_A-Za-z\x80-\xff]+[\x09\x20]?)|(?:[ \t]+)|(?:\r?\n)|(?:.+?)')
diff --git a/app/views/wiki_pages/show.html.erb b/app/views/wiki_pages/show.html.erb
index b6b6448b3..432ed59b1 100644
--- a/app/views/wiki_pages/show.html.erb
+++ b/app/views/wiki_pages/show.html.erb
@@ -13,6 +13,14 @@
       
       <div id="wiki-page-body" class="prose">
         <%= format_text(@wiki_page.body) %>
+        
+        <% if @wiki_page.presenter.antecedent_tag_alias %>
+          <p class="hint">This tag has been aliased to <%= link_to @wiki_page.presenter.antecedent_tag_alias.consequent_name, posts_path(:tags => @wiki_page.presenter.antecedent_tag_alias.consequent_name) %>.</p>
+        <% end %>
+
+        <% if @wiki_page.presenter.consequent_tag_aliases.any? %>
+          <p class="hint">The following tags are aliased to this tag: <%= raw @wiki_page.presenter.consequent_tag_aliases.map {|x| link_to(x.antecedent_name, posts_path(:tags => x.antecedent_name))}.join(", ") %>.</p>
+        <% end %>
       </div>
       
       <div id="wiki-page-posts">