--- ../../orig/mediawiki-1.14.0/includes/OutputPage.php	2008-12-31 17:56:04.000000000 +0000
+++ OutputPage.php	2009-03-11 17:34:13.000000000 +0000
@@ -1572,12 +1572,13 @@
 						wfMsg( "site-{$type}-feed", $wgSitename ) );
 				}
 			}
-			else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
+			else {
 				foreach( $wgFeedClasses as $format => $class ) {
 					$tags[] = $this->feedLink(
 						$format,
 						$rctitle->getFullURL( "feed={$format}" ),
-						wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'.
+						wfMsg( "site-{$format}-feed", $wgSitename ), # For grep: 'site-rss-feed', 'site-atom-feed'.
+						$rctitle->getFullURL('')); 
 				}
 			}
 		}
@@ -1610,12 +1611,14 @@
 	/**
 	 * Generate a <link rel/> for an RSS feed.
 	 */
-	private function feedLink( $type, $url, $text ) {
-		return Xml::element( 'link', array(
+	private function feedLink( $type, $url, $text, $about='') {
+		$arr = array(
 			'rel' => 'alternate',
 			'type' => "application/$type+xml",
 			'title' => $text,
-			'href' => $url ) );
+			'href' => $url );
+		if (strlen($about)) $arr['about'] = $about;
+		return Xml::element( 'link', $arr );
 	}
 
 	/**