diff --git a/plugins/feedreplacement.php b/plugins/feedreplacement.php
index 590b437..0a3bc7d 100644
--- a/plugins/feedreplacement.php
+++ b/plugins/feedreplacement.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: FeedReplacement
-Plugin URI: http://www.gelatocms.com/plugins/feedreplacement/
+Plugin URI:  http://plugins.gelatocms.com/feedreplacement/
 Description: 
 Author: Victor Bracco
 Author URI: http://www.vbracco.com.ar/
@@ -24,6 +24,8 @@ class feedreplacement extends plugins {
 		//lo mismo pero con el que esta en el header
 		$this->addAction('gelato_includes', 'feedreplacement_includeFeed');
 		
+		//redirecting all trafic
+		$this->addAction('feed_header', 'feedreplacement_redirect');
 		
 		//guarda la opcion si viene por POST
 		if ($user->isAdmin()) {
@@ -64,6 +66,15 @@ class feedreplacement extends plugins {
 		}
 	}
 	
+	function feedreplacement_redirect(){
+		global $conf;
+		$feedreplacement_url = $conf->get_option('feedreplacement_url');
+		if (!preg_match("/feedburner|feedvalidator/i", $_SERVER['HTTP_USER_AGENT'])) {
+			header("Location: ".$feedreplacement_url);
+			header("HTTP/1.1 302 Temporary Redirect");
+			exit();
+		}
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/rss.php b/rss.php
index 10ed469..4c348f2 100644
--- a/rss.php
+++ b/rss.php
@@ -12,10 +12,12 @@ if(!defined('entry')) define('entry',true);
   =========================== */
 ?>
 <?php
+	require('entry.php');
+	$trigger->call('feed_header');
+	
 	header("Content-type: text/xml; charset=utf-8");
 	$isFeed = true;
 	
-	require('entry.php');
 	global $conf, $tumble;