diff --git a/external/feedcreator.class.php b/external/feedcreator.class.php
index 3c38104f7d..cc0d5207fd 100644
--- a/external/feedcreator.class.php
+++ b/external/feedcreator.class.php
@@ -904,6 +904,7 @@ function createFeed() {
         $feed.= '    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"'."\n";
         $feed.= '    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"'."\n";
 		$feed.= ">\n";
+        $feed.= '    <atom:link href="'.$this->syndicationURL.'" rel="self" type="application/rss+xml" />'."\n";
 		$feed.= "    <channel>\n";
 		$feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
 		$this->descriptionTruncSize = 500;
diff --git a/framework/core/controllers/expController.php b/framework/core/controllers/expController.php
index ba5067bfb1..8819761f11 100755
--- a/framework/core/controllers/expController.php
+++ b/framework/core/controllers/expController.php
@@ -584,6 +584,7 @@ function getRSSContent() {
             $rss_item->description = expString::convertSmartQuotes($item->body);
             $rss_item->date = isset($item->publish_date) ? date('r',$item->publish_date) : date('r', $item->created_at);
             $rss_item->link = makeLink(array('controller'=>$this->classname, 'action'=>'show', 'title'=>$item->sef_url));
+            $rss_item->guid = expUnserialize($item->location_data)->src.'-id#'.$item->id;
             if (!empty($item->expCat[0]->title)) $rss_item->category = array($item->expCat[0]->title);
             $comment_count = expCommentController::findComments(array('content_id'=>$item->id,'content_type'=>$this->basemodel_name));
             if ($comment_count) {
diff --git a/framework/modules/blog/controllers/blogController.php b/framework/modules/blog/controllers/blogController.php
index b502bc31bf..3aabb0b594 100755
--- a/framework/modules/blog/controllers/blogController.php
+++ b/framework/modules/blog/controllers/blogController.php
@@ -279,6 +279,7 @@ function getRSSContent() {
             $rss_item->description = expString::convertSmartQuotes($item->body);
             $rss_item->date = isset($item->publish_date) ? date('r',$item->publish_date) : date('r', $item->created_at);
             $rss_item->link = makeLink(array('controller'=>$this->classname, 'action'=>'show', 'title'=>$item->sef_url));
+            $rss_item->guid = expUnserialize($item->location_data)->src.'-id#'.$item->id;
             if (!empty($item->expCat[0]->title)) $rss_item->category = array($item->expCat[0]->title);
             $comment_count = expCommentController::findComments(array('content_id'=>$item->id,'content_type'=>$this->basemodel_name));
             if ($comment_count) {
diff --git a/framework/modules/filedownloads/controllers/filedownloadController.php b/framework/modules/filedownloads/controllers/filedownloadController.php
index a186a0337e..806ff33e4f 100755
--- a/framework/modules/filedownloads/controllers/filedownloadController.php
+++ b/framework/modules/filedownloads/controllers/filedownloadController.php
@@ -166,6 +166,7 @@ function getRSSContent() {
             $rss_item->description = expString::convertSmartQuotes($item->body);
             $rss_item->date = isset($item->publish_date) ? date('r',$item->publish_date) : date('r', $item->created_at);
             $rss_item->link = makeLink(array('controller'=>$this->classname, 'action'=>'show', 'title'=>$item->sef_url));
+            $rss_item->guid = expUnserialize($item->location_data)->src.'-id#'.$item->id;
             if (!empty($item->expCat[0]->title)) $rss_item->category = array($item->expCat[0]->title);
 
             // Add the attachment/enclosure info
diff --git a/site_rss.php b/site_rss.php
index 3aef1573b9..1dd9470dc0 100644
--- a/site_rss.php
+++ b/site_rss.php
@@ -41,13 +41,14 @@
 
 if ($site_rss->enable_rss == true) {
 	$rss = new UniversalFeedCreator();
+    $rss->encoding = LANG_CHARSET;
 	$rss->cssStyleSheet = "";
 //	$rss->useCached("PODCAST");
 	$rss->useCached();
 	$rss->title = $site_rss->feed_title;
 	$rss->description = $site_rss->feed_desc;
     $rss->image->url = URL_FULL.'themes/'.DISPLAY_THEME.'/images/logo.png';
-    $rss->image->title = ORGANIZATION_NAME;
+    $rss->image->title = $site_rss->feed_title;
     $rss->image->link = URL_FULL;
 //    $rss->image->width = 64;
 //    $rss->image->height = 64;