diff --git a/backend.php b/backend.php
index ebbf33a68..719cb1b16 100644
--- a/backend.php
+++ b/backend.php
@@ -593,9 +593,13 @@
 			if ($entry_author) {
 				$entry_author = " - by $entry_author";
 			}
-			
-			print "<tr><td><a $link_target href=\"" . $line["link"] . "\">" . $line["title"] . 
-				"</a>$entry_author</td>";
+
+			if ($line["link"]) {
+				print "<tr><td><a $link_target href=\"" . $line["link"] . "\">" . 
+					$line["title"] . "</a>$entry_author</td>";
+			} else {
+				print "<tr><td>" . $line["title"] . "$entry_author</td>";
+			}
 
 			$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'), 
 				strtotime($line["updated"]));
diff --git a/functions.php b/functions.php
index cfad6cc79..56c778071 100644
--- a/functions.php
+++ b/functions.php
@@ -491,7 +491,8 @@
 		
 					if (!$entry_guid) $entry_guid = $item["guid"];
 					if (!$entry_guid) $entry_guid = $item["link"];
-	
+					if (!$entry_guid) $entry_guid = make_guid_from_title($item["title"]);
+
 					if (!$entry_guid) continue;
 	
 					$entry_timestamp = "";
@@ -521,7 +522,7 @@
 					if (!$entry_link) $entry_link = $item["link"];
 	
 					if (!$entry_title) continue;
-					if (!$entry_link) continue;
+#					if (!$entry_link) continue;
 
 					$entry_link = strip_tags($entry_link);
 
@@ -2279,6 +2280,7 @@
 				$content_query_part = "content as content_preview,";
 				
 				$query = "SELECT 
+						guid,
 						ttrss_entries.id,ttrss_entries.title,
 						SUBSTRING(updated,1,16) as updated,
 						unread,feed_id,marked,link,last_read,
@@ -2308,6 +2310,7 @@
 				$feed_kind = "Tags";
 	
 				$result = db_query($link, "SELECT
+					guid,
 					ttrss_entries.id as id,title,
 					SUBSTRING(updated,1,16) as updated,
 					unread,feed_id,
@@ -2351,6 +2354,7 @@
 
 		while ($line = db_fetch_assoc($result)) {
 			print "<item>";
+			print "<id>" . htmlspecialchars($line["guid"]) . "</id>";
 			print "<link>" . htmlspecialchars($line["link"]) . "</link>";
 
 			$rfc822_date = date('r', strtotime($line["updated"]));
@@ -2588,4 +2592,9 @@
 		return htmlspecialchars(db_unescape_string($s));
 	}
 
+	function make_guid_from_title($title) {
+		return preg_replace("/[ \"\',.:;]/", "-", 
+			mb_strtolower(strip_tags($title)));
+	}
+
 ?>