diff --git a/index.php b/index.php
index 4f78b3f..5abd3fd 100644
--- a/index.php
+++ b/index.php
@@ -49,8 +49,6 @@ $theme = new themes;
         }
 
 		$feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
-		$trigger->call('feed_url');
-		$theme->set('rssFeed',"\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$feed_url."\"/>\n");
 
         $gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
         $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";
@@ -75,6 +73,7 @@ $theme = new themes;
 		}
 
 		$trigger->call('gelato_includes');
+		$theme->set('rssFeed',$feed_url);
 		$theme->set('Gelato_includes',$gelato_includes);
 		$theme->set('Title',$conf->title);
 		$theme->set('Page_Title',$page_title);
diff --git a/plugins/feedreplacement.php b/plugins/feedreplacement.php
index 0a3bc7d..fdfb223 100644
--- a/plugins/feedreplacement.php
+++ b/plugins/feedreplacement.php
@@ -57,12 +57,10 @@ class feedreplacement extends plugins {
 	}
 	
 	function feedreplacement_includeFeed(){
-		global $conf,$gelato_includes;
+		global $conf,$gelato_includes,$feed_url;
 		$feedreplacement_url = $conf->get_option('feedreplacement_url');
 		if($feedreplacement_url!=""){
-			$feed = ($conf->urlFriendly?"/rss/":"/rss.php");
-			$url = $conf->urlGelato.$feed;
-			$gelato_includes = str_replace($url,$feedreplacement_url,$gelato_includes);
+			$feed_url = $feedreplacement_url;
 		}
 	}
 	
diff --git a/themes/tumblr/index.htm b/themes/tumblr/index.htm
index 1cd9d25..cf0690c 100644
--- a/themes/tumblr/index.htm
+++ b/themes/tumblr/index.htm
@@ -7,8 +7,8 @@
 	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
 	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>
-	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
-	{rssFeed}
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{rssFeed}" />
     <title>{Page_Title}</title>
     <!--[if IE]>
         <style type="text/css">
@@ -20,7 +20,7 @@
 </head>
 <body>
     <div id="container">
-        <a href="{URL_Tumble}/rss.php"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
+        <a href="{rssFeed}"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
 
         <h1><a href="{URL_Tumble}/">{Title}</a></h1>