Index: /MediaWiki/trunk/FCKeditorParser.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1883)
+++ /MediaWiki/trunk/FCKeditorParser.body.php	(revision 1884)
@@ -453,5 +453,10 @@
 			$appendString = "";
 			foreach ($categories as $cat=>$val) {
-				$appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+				if ($val != $title->mTextform) {
+					$appendString .= "<a href=\"Category:" . $cat ."\">" . $val ."</a> ";
+				}
+				else {
+					$appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+				}
 			}
 			$parserOutput->setText($parserOutput->getText() . $appendString);
Index: /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php
===================================================================
--- /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1883)
+++ /MediaWiki/trunk/mw12/FCKeditorParser_OldPP.body.php	(revision 1884)
@@ -453,5 +453,10 @@
 			$appendString = "";
 			foreach ($categories as $cat=>$val) {
-				$appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+				if ($val != $title->mTextform) {
+					$appendString .= "<a href=\"Category:" . $cat ."\">" . $val ."</a> ";
+				}
+				else {
+					$appendString .= "<a href=\"Category:" . $cat ."\">Category:" . $cat ."</a> ";
+				}
 			}
 			$parserOutput->setText($parserOutput->getText() . $appendString);
Index: /MediaWiki/trunk/plugins/mediawiki/fckplugin.js
===================================================================
--- /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 1883)
+++ /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 1884)
@@ -300,6 +300,5 @@
 							}
 							stringBuilder.push( href ) ;
-							//if ( href != htmlNode.innerHTML && htmlNode.innerHTML != '[n]' )
-							if ( htmlNode.innerHTML != '[n]' )
+							if ( htmlNode.innerHTML != '[n]' && (!isWikiUrl || href != htmlNode.innerHTML || !href.toLowerCase().StartsWith("category:")))
 							{
 								stringBuilder.push( isWikiUrl? '|' : ' ' ) ;