diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 5f0400fea..244fb1f84 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -175,6 +175,17 @@ class FeedItem_Atom extends FeedItem_Common {
 			array_push($encs, $enc);
 		}
 
+		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+		foreach ($enclosures as $enclosure) {
+			$enc = new FeedEnclosure();
+
+			$enc->type = "image/generic";
+			$enc->link = $enclosure->getAttribute("url");
+
+			array_push($encs, $enc);
+		}
+
 		return $encs;
 	}
 
diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index b5d9695e2..f632d3bbf 100644
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -150,6 +150,17 @@ class FeedItem_RSS extends FeedItem_Common {
 			array_push($encs, $enc);
 		}
 
+		$enclosures = $this->xpath->query("media:thumbnail", $this->elem);
+
+		foreach ($enclosures as $enclosure) {
+			$enc = new FeedEnclosure();
+
+			$enc->type = "image/generic";
+			$enc->link = $enclosure->getAttribute("url");
+
+			array_push($encs, $enc);
+		}
+
 		return $encs;
 	}