diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb
index d4b23b8..646c42d 100644
--- a/app/helpers/pages_helper.rb
+++ b/app/helpers/pages_helper.rb
@@ -2,16 +2,16 @@ module PagesHelper

   def wikified_body(body)
     r = RedCloth.new(body)
-    r.gsub!(/\[\[(.*)\]\]/) {wiki_link($1)}
+    r.gsub!(/\[\[(.*)(\|(.*))?\]\]/) {wiki_link(*$1.split("|"))}
     r.to_html
   end

-  def wiki_link(wiki_words)
+  def wiki_link(wiki_words, link_text = nil)
     permalink = wiki_words.downcase.gsub(' ', '-')
     if Page.exists?(:permalink => permalink)
-      link_to wiki_words, wiki_page_url(permalink)
+      link_to ((link_text || wiki_words), wiki_page_url(permalink))
     else
-      link_to wiki_words, wiki_page_url(permalink), :class => "new_wiki_link" 
+      link_to ((link_text || wiki_words), wiki_page_url(permalink), :class => "new_wiki_link")
     end
   end