diff --git a/lib/class/ampacherss.class.php b/lib/class/ampacherss.class.php
index 69684f82..fb289f4e 100644
--- a/lib/class/ampacherss.class.php
+++ b/lib/class/ampacherss.class.php
@@ -72,7 +72,7 @@ class AmpacheRSS {
 				'latest_album'=>_('Newest Albums'),
 				'latest_artist'=>_('Newest Artists')); 
 
-		return $titles[$this->type]; 
+		return scrub_out(Config::get('site_title')) . ' - ' . $titles[$this->type]; 
 
 	} // get_title
 
@@ -108,7 +108,7 @@ class AmpacheRSS {
  	 * get_display
 	 * This dumps out some html and an icon for the type of rss that we specify
 	 */
-	public static function get_display($type='nowplaying') { 
+	public static function get_display($type='now_playing') { 
 
 		// Default to now playing
 		$type = self::validate_type($type); 
@@ -162,6 +162,78 @@ class AmpacheRSS {
 
 		return $element['expire']; 
 
-	} // pubdate_now_playing	
+	} // pubdate_now_playing
+
+	/**
+	 * load_recently_played
+	 * This loads in the recently played information and formats it up real nice like
+	 */
+	public static function load_recently_played() { 
+
+		//FIXME: The time stuff should be centralized, it's currently in two places, lame
+
+		$time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago'));
+		$data = Song::get_recently_played(); 
+
+		$results = array(); 
+
+		foreach ($data as $item) { 
+			$client = new User($item['user']); 
+			$song = new Song($item['object_id']); 
+			$song->format(); 
+			$amount = intval(time() - $item['date']+2); 
+			$time_place = '0'; 
+		        while ($amount >= 1) {
+		                $final = $amount;
+		                $time_place++;
+	        	        if ($time_place <= 2) {
+	        	                $amount = floor($amount/60);
+		                }
+		                if ($time_place == '3') {
+		                        $amount = floor($amount/24);
+		                }
+		                if ($time_place == '4') {
+		                        $amount = floor($amount/7);
+		                }
+		                if ($time_place == '5') {
+		                        $amount = floor($amount/4);
+		                }
+		                if ($time_place == '6') {
+		                        $amount = floor ($amount/12);
+		                }
+		                if ($time_place > '6') {
+		                        $final = $amount . '+';
+		                        break;
+				} 
+		        } // end while
+
+			$time_string = $final . ' ' . $time_unit[$time_place];
+
+			$xml_array = array('title'=>$song->f_title . ' - ' . $song->f_artist . ' - ' . $song->f_album,
+						'link'=>$song->link,
+						'description'=>$song->title . ' - ' . $song->f_artist_full . ' - ' . $song->f_album_full . ' - ' . $time_string,
+						'comments'=>$client->username,
+						'pubDate'=>date("r",$item['date'])); 
+			$results[] = $xml_array; 
+
+		} // end foreach 
+
+		return $results; 
+
+	} // load_recently_played
+
+	/**
+	 * pubdate_recently_played
+	 * This just returns the 'newest' recently played entry
+	 */
+	public static function pubdate_recently_played() { 
+
+		$data = Song::get_recently_played(); 
+
+		$element = array_shift($data);
+		
+		return $element['date']; 
+
+	} // pubdate_recently_played
 
 } // end AmpacheRSS class
diff --git a/rss.php b/rss.php
index 329b5282..7557a179 100644
--- a/rss.php
+++ b/rss.php
@@ -34,6 +34,4 @@ header("Content-Type: application/xml; charset=" . Config::get('site_charset'));
 $rss = new AmpacheRSS($_REQUEST['type']); 
 echo $rss->get_xml(); 
 
-//show_RSS($_REQUEST['type'],$_REQUEST['username']);
-
 ?>
diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php
index a638a24d..089c474e 100644
--- a/templates/show_recently_played.inc.php
+++ b/templates/show_recently_played.inc.php
@@ -21,7 +21,7 @@
 
 /* Define the time places starting at 0 */
 $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago')); 
-$link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('recentlyplayed') :  '';
+$link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('recently_played') :  '';
 show_box_top(_('Recently Played') . $link);
 ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">