Index: link-template.php
===================================================================
--- link-template.php	(revision 8700)
+++ link-template.php	(working copy)
@@ -327,17 +327,20 @@
 		$feed = get_default_feed();
 
 	if ( '' == $permalink_structure ) {
-		$link = get_option('home') . '?feed=rss2&author=' . $author_id;
+		$link = get_option('home') . "?feed=$feed&author=" . $author_id;
 	} else {
 		$link = get_author_posts_url($author_id);
-		$link = trailingslashit($link) . user_trailingslashit('feed', 'feed');
+		if( $feed == get_default_feed() )
+			$feed_link = 'feed';
+		else
+			$feed_link = "feed/$feed";
+		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
 
-	$link = apply_filters('author_feed_link', $link);
+	$link = apply_filters('author_feed_link', $link,$feed);
 
 	return $link;
 }
-
 /** get_category_feed_link() - Get the feed link for a given category
  *
  * Returns a link to the feed for all post in a given category.  A specific feed can be requested