diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index b0db313a..38e02e1a 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -26,6 +26,9 @@ class AtomFormat extends FormatAbstract{
 			$entryUri = isset($item['uri']) ? $this->xml_encode($item['uri']) : '';
 			$entryTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_ATOM, $item['timestamp'])) : '';
 			$entryContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : '';
+  		$entryEnclosures = "";
+  		foreach($item['enclosures'] as $enclosure)
+  			$entryEnclosures .= "<link rel=\"enclosure\" href=\"".$this->xml_encode($enclosure)."\"/>";
 			$entries .= <<<EOD
 
 	<entry>
@@ -37,6 +40,7 @@ class AtomFormat extends FormatAbstract{
 		<id>{$entryUri}</id>
 		<updated>{$entryTimestamp}</updated>
 		<content type="html">{$entryContent}</content>
+		{$entryEnclosures}
 	</entry>
 
 EOD;
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 373c438d..80d2b2b9 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -30,6 +30,9 @@ class MrssFormat extends FormatAbstract {
 			$itemUri = isset($item['uri']) ? $this->xml_encode($item['uri']) : '';
 			$itemTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_RFC2822, $item['timestamp'])) : '';
 			$itemContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : '';
+  		$entryEnclosures = "";
+  		foreach($item['enclosures'] as $enclosure)
+  			$entryEnclosures .= "<enclosure url=\"".xml_encode($enclosure)."\"/>";
 			$items .= <<<EOD
 
 	<item>
@@ -39,6 +42,7 @@ class MrssFormat extends FormatAbstract {
 		<pubDate>{$itemTimestamp}</pubDate>
 		<description>{$itemContent}</description>
 		<author>{$itemAuthor}</author>
+		{$entryEnclosures}
 	</item>
 
 EOD;