diff --git a/ext/bbcode/main.php b/ext/bbcode/main.php
index 05c365b5..b188412f 100644
--- a/ext/bbcode/main.php
+++ b/ext/bbcode/main.php
@@ -18,7 +18,8 @@ class BBCode extends Extension {
 		$text = preg_replace("/&gt;&gt;([^\d].+)/", "<blockquote><small>\\1</small></blockquote>", $text);
 		$text = preg_replace("/\[url=((?:https?|ftp|irc):\/\/.*?)\](.*?)\[\/url\]/s", "<a href='\\1'>\\2</a>", $text);
 		$text = preg_replace("/\[url\]((?:https?|ftp|irc):\/\/.*?)\[\/url\]/s", "<a href='\\1'>\\1</a>", $text);
-		$text = preg_replace("/\[\[(.*?)\]\]/s", "<a href='".make_link("wiki/\\1")."'>\\1</a>", $text);
+		$text = preg_replace("/\[\[([^\|\]]+)\|([^\]]+)\]\]/s", "<a href='".make_link("wiki/\\1")."'>\\2</a>", $text);
+		$text = preg_replace("/\[\[([^\]]+)\]\]/s", "<a href='".make_link("wiki/\\1")."'>\\1</a>", $text);
 		$text = str_replace("\n", "\n<br>", $text);
 		$text = preg_replace("/\[quote\](.*?)\[\/quote\]/s", "<blockquote><small>\\1</small></blockquote>", $text);
 		$text = preg_replace("/\[quote=(.*?)\](.*?)\[\/quote\]/s", "<small><small>Quoting \\1</small></small><blockquote><small>\\2</small></blockquote>", $text);
@@ -44,7 +45,8 @@ class BBCode extends Extension {
 		$text = preg_replace("/\[code\](.*?)\[\/code\]/s", "\\1", $text);
 		$text = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/s", "\\2", $text);
 		$text = preg_replace("/\[url\](.*?)\[\/url\]/s", "\\1", $text);
-		$text = preg_replace("/\[\[(.*?)\]\]/s", "\\1", $text);
+		$text = preg_replace("/\[\[([^\|\]]+)\|([^\]]+)\]\]/s", "\\2", $text);
+		$text = preg_replace("/\[\[([^\]]+)\]\]/s", "\\1", $text);
 		$text = preg_replace("/\[quote\](.*?)\[\/quote\]/s", "", $text);
 		$text = preg_replace("/\[quote=(.*?)\](.*?)\[\/quote\]/s", "", $text);
 		$text = preg_replace("/\[h1\](.*?)\[\/h1\]/s", "\\1", $text);