Index: link-template.php
===================================================================
--- link-template.php	(revision 10912)
+++ link-template.php	(working copy)
@@ -468,7 +468,7 @@
 		$feed = get_default_feed();
 
 	if ( '' == $permalink_structure ) {
-		$link = get_option('home') . "?feed=$feed&author=" . $author_id;
+		$link = get_option('home') . "/?feed=$feed&author=" . $author_id;
 	} else {
 		$link = get_author_posts_url($author_id);
 		if ( $feed == get_default_feed() )
@@ -512,7 +512,7 @@
 	$permalink_structure = get_option('permalink_structure');
 
 	if ( '' == $permalink_structure ) {
-		$link = trailingslashit( get_option('home') ) . "?feed=$feed&cat=" . $cat_id;
+		$link = get_option('home') . "/?feed=$feed&cat=" . $cat_id;
 	} else {
 		$link = get_category_link($cat_id);
 		if( $feed == get_default_feed() )
@@ -551,7 +551,7 @@
 		$feed = get_default_feed();
 
 	if ( '' == $permalink_structure ) {
-		$link = get_option('home') . "?feed=$feed&tag=" . $tag->slug;
+		$link = get_option('home') . "/?feed=$feed&tag=" . $tag->slug;
 	} else {
 		$link = get_tag_link($tag->term_id);
 		if ( $feed == get_default_feed() )
@@ -626,7 +626,7 @@
 	if ( empty($feed) )
 		$feed = get_default_feed();
 
-	$link = get_option('home') . "?s=$search&feed=$feed";
+	$link = get_option('home') . "/?s=$search&feed=$feed";
 
 	$link = apply_filters('search_feed_link', $link);
 
@@ -651,7 +651,7 @@
 	if ( empty($feed) )
 		$feed = get_default_feed();
 
-	$link = get_option('home') . "?s=$search&feed=comments-$feed";
+	$link = get_option('home') . "/?s=$search&feed=comments-$feed";
 
 	$link = apply_filters('search_feed_link', $link);