diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 39dbe70edd8..301a14ce868 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -64,7 +64,7 @@
 			global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgOut;
 			global $wgScript, $wgStyleSheetPath, $wgLanguageCode, $wgUseNewInterlanguage;
 			global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
-			global $wgDisableCounters, $wgLogo, $action;
+			global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
 			
 			extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
@@ -92,6 +92,17 @@
 			$tpl->setRef( "thispage", &$this->thispage );
 			$tpl->set( "subtitle", $out->getSubtitle() );
 			$tpl->set( 'catlinks', getCategories());
+			if( $wgOut->isSyndicated() ) {
+				$feeds = array();
+				foreach( $wgFeedClasses as $format => $class ) {
+					$feeds[$format] = array(
+						'text' => $format,
+						'href' => $wgRequest->escapeAppendQuery( "feed=$format" ),
+						'ttip' => wfMsg('tooltip-'.$format)
+					);
+				}
+				$tpl->setRef( 'feeds', &$feeds );
+			}
 			$tpl->setRef( 'mimetype', &$wgMimeType );
 			$tpl->setRef( 'charset', &$wgOutputEncoding );
 			$tpl->set( 'headlinks', $out->getHeadLinks() );
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index dd17a05345d..ba649eaa49a 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -466,7 +466,8 @@ class PreferencesForm {
 
 		$wgOut->addHTML( "
 	<div>
-		<input type='submit' name=\"wpSaveprefs\" value=\"$svp\" />
+		<input type='submit' name=\"wpSaveprefs\" value=\"$svp\" accesskey=\"".
+		wfMsg('accesskey-save')."\" title=\"[alt-".wfMsg('accesskey-save')."]\" />
 		<input type='submit' name=\"wpReset\" value=\"$rsp\" />
 	</div>
 	
diff --git a/languages/Language.php b/languages/Language.php
index 622117da3e5..9fc5adacf74 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -563,6 +563,7 @@ performed by sysops with  \"bureaucrat\" status.",
 "hidetoc" => "hide",
 "thisisdeleted" => "View or restore $1?",
 "restorelink" => "$1 deleted edits",
+'feedlinks' => 'Feeds:',
 
 # Main script and global functions
 #
@@ -1549,6 +1550,7 @@ amusement.",
 'tooltip-preview' => 'Preview your changes, please use this before saving! [alt-p]',
 'tooltip-contributions' => 'View the list of contributions of this user',
 'tooltip-emailuser' => 'Send a mail to this user',
+'tooltip-rss' => 'RSS feed for this page',
 
 # Metadata
 "nodublincore" => "Dublin Core RDF metadata disabled for this server.",
diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index cc92bf31abc..90407e95d34 100644
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -96,6 +96,9 @@
                 <li tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
                   i18n:attributes="title string:tooltip-currentevents|default" 
                   i18n:translate="string:currentevents">Current Events</a></li>
+                <li><a href="${nav_urls/recentchanges/href}"
+                  i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
+                  i18n:translate="string:recentchanges">Recent Changes</a></li>
                 <li><a href="${nav_urls/randompage/href}"
                   i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" 
                   i18n:translate="string:randompage">Random Page</a></li>
@@ -131,27 +134,31 @@
           <div class="portletBody">
             <div class="portletContent odd">
               <ul>
-                <li><a href="${nav_urls/recentchanges/href}"
-                  i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
-                  i18n:translate="string:recentchanges">Recent Changes</a></li>
                 <li><a href="${nav_urls/whatlinkshere/href}"
                   i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" 
                   i18n:translate="string:whatlinkshere">What links here</a></li>
                 <li><a href="${nav_urls/recentchangeslinked/href}"
                   i18n:attributes="accesskey string:accesskey-recentchangeslinked|default;title string:tooltip-recentchangeslinked | default"
                   i18n:translate="string:recentchangeslinked">Related Changes</a></li>
+                <li tal:condition="feeds" id="feedlinks">
+                <span i18n:translate="string:feedlinks">Feeds:</span>
+                <span tal:repeat="feed feeds" 
+                  tal:attributes="id string:feed-${repeat/feed/key};"><a 
+                    tal:attributes="href feed/href; title feed/ttip|default"
+                    tal:content="feed/text">rss</a></span>
+                </li>
                 <li tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
                   i18n:attributes="accesskey string:accesskey-contributions|default; title string:tooltip-contributions|default" 
                   i18n:translate="string:contributions">Contributions</a></li>
                 <li tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
                   i18n:attributes="accesskey string:accesskey-emailuser|default; title string:tooltip-emailuser|default" 
                   i18n:translate="string:emailuser">Email this user</a></li>
-                <li><a href="${nav_urls/specialpages/href}"
-                  i18n:attributes="accesskey string:accesskey-specialpages|default;title string:tooltip-specialpages|default"
-                  i18n:translate="string:specialpages">Special Pages</a></li>
                 <li tal:condition="loggedin"><a href="${nav_urls/upload/href}"
                   i18n:attributes="accesskey string:accesskey-upload|default; title string:tooltip-upload|default" 
                   i18n:translate="string:upload">Upload a file</a></li>
+                <li><a href="${nav_urls/specialpages/href}"
+                  i18n:attributes="accesskey string:accesskey-specialpages|default;title string:tooltip-specialpages|default"
+                  i18n:translate="string:specialpages">Special Pages</a></li>
               </ul>
             </div>
           </div>