diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index 96841d8..6f8da9a 100755
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -301,11 +301,10 @@ class Main extends CI_Controller
 		
 		if ($check) 
 		{
+			$paste = $this->pastes->getPaste(3);
 			$data = $this->pastes->getReplies(3);
-			$data['feed_url'] = '';
-			$data['page_description'] = '';
-			$data['page_language'] = '';
-			$data['creator_email'] = '';
+			$data['page_title'] = $paste['title'] . ' - ' . $this->config->item('site_name');
+			$data['feed_url'] = site_url('view/rss/' . $this->uri->segment(3));
 			$this->load->view('view/rss', $data);
 		}
 		else
diff --git a/htdocs/application/views/view/rss.php b/htdocs/application/views/view/rss.php
index 7a52c7a..419c3e1 100644
--- a/htdocs/application/views/view/rss.php
+++ b/htdocs/application/views/view/rss.php
@@ -6,7 +6,12 @@ xmlns:dc="http://purl.org/dc/elements/1.1/"
 xmlns:atom="http://www.w3.org/2005/Atom"
 xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
 xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
-><channel><title>Stikked</title> <atom:link href="<?php echo $feed_url; ?>" rel="self" type="application/rss+xml" /><link><?php echo $feed_url; ?></link> <language>en</language> <sy:updatePeriod>hourly</sy:updatePeriod> <sy:updateFrequency>1</sy:updateFrequency>
+>
+<channel>
+    <title><?php echo $page_title; ?></title>
+    <atom:link href="<?php echo $feed_url; ?>" rel="self" type="application/rss+xml" />
+    <link><?php echo base_url(); ?></link>
+    <language>en</language>
 <?php foreach($replies as $paste): ?>
 <item>
     <title><?php echo $paste['title']; ?></title>
@@ -14,7 +19,6 @@ xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
     <pubDate><?php echo date('c', $paste['created']); ?></pubDate>
     <dc:creator><?php echo $paste['name']; ?></dc:creator>
     <guid isPermaLink="false"><?php echo site_url('view/' . $paste['pid']) ?></guid>
-    <description><![CDATA[<?php echo $paste['paste']; ?>]]></description>
     <content:encoded><![CDATA[<?php echo $paste['paste']; ?>]]></content:encoded>
 </item>
 <?php endforeach; ?>