diff --git a/Changelog b/Changelog
index bce033d9c..fd8d2888d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.9.9
+    - BUGFIX: More reliable RSS feed parsing (closes #1001777)
+
 * Sat May 5 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.8
     - BUGFIX: Various UI style fixes
     - BUGFIX: Fix compilation with gcc 4.7
diff --git a/src/rss/rssarticle.cpp b/src/rss/rssarticle.cpp
index 8a557e93e..c2ae3618c 100644
--- a/src/rss/rssarticle.cpp
+++ b/src/rss/rssarticle.cpp
@@ -229,6 +229,13 @@ RssArticle::RssArticle(RssFeed* parent, QXmlStreamReader& xml)
       }
     }
   }
+  // If guid is empty, fall back to some other identifier
+  if (d->guid.isEmpty()) {
+    if (!d->link.isEmpty())
+      d->guid = d->link;
+    else if (!d->title.isEmpty())
+      d->guid = d->title;
+  }
 }
 
 RssArticle::RssArticle(RssFeed* parent, const QString &guid) {