diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
index cee2020..b7e0d0e 100644
--- a/css/HtmlFormat.css
+++ b/css/HtmlFormat.css
@@ -70,12 +70,19 @@ a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link,
 
 }
 
-section > div.content {
+section > div.content, section > div.attachments {
 
 	padding: 10px;
 
 }
 
+section > div.attachments > li.enclosure {
+
+	list-style-type: circle;
+	list-style-position: inside;
+
+}
+
 section > time, section > p.author {
 
 	color: #888;
diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 1944905..bb9abb5 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -27,9 +27,14 @@ class AtomFormat extends FormatAbstract{
 			$entryTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_ATOM, $item['timestamp'])) : '';
 			$entryContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : '';
 
-			$entryEnclosure = '';
-			if(isset($item['enclosure'])){
-				$entryEnclosure = '<link rel="enclosure" href="' . $this->xml_encode($item['enclosure']) . '"/>';
+			$entryEnclosures = '';
+			if(isset($item['enclosures'])){
+				foreach($item['enclosures'] as $enclosure){
+					$entryEnclosures .= '<link rel="enclosure" href="'
+					. $this->xml_encode($enclosure)
+					. '"/>'
+					. PHP_EOL;
+				}
 			}
 
 			$entries .= <<<EOD
@@ -43,7 +48,7 @@ class AtomFormat extends FormatAbstract{
 		<id>{$entryUri}</id>
 		<updated>{$entryTimestamp}</updated>
 		<content type="html">{$entryContent}</content>
-		{$entryEnclosure}
+		{$entryEnclosures}
 	</entry>
 
 EOD;
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 8f96466..3e5e59d 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -30,11 +30,21 @@ class HtmlFormat extends FormatAbstract {
 				. '</div>';
 			}
 
-			$entryEnclosure = '';
-			if(isset($item['enclosure'])){
-				$entryEnclosure = '<div class="enclosure"><a href="'
-				. $this->sanitizeHtml($item['enclosure'])
-				. '">enclosure</a><div>';
+			$entryEnclosures = '';
+			if(isset($item['enclosures'])){
+				$entryEnclosures = '<div class="attachments"><p>Attachments:</p>';
+
+				foreach($item['enclosures'] as $enclosure){
+					$url = $this->sanitizeHtml($enclosure);
+
+					$entryEnclosures .= '<li class="enclosure"><a href="'
+					. $url
+					. '">'
+					. substr($url, strrpos($url, '/') + 1)
+					. '</a></li>';
+				}
+
+				$entryEnclosures .= '</div>';
 			}
 
 			$entries .= <<<EOD
@@ -44,7 +54,7 @@ class HtmlFormat extends FormatAbstract {
 	{$entryTimestamp}
 	{$entryAuthor}
 	{$entryContent}
-	{$entryEnclosure}
+	{$entryEnclosures}
 </section>
 
 EOD;
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 19c703e..a7573f5 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -31,9 +31,23 @@ class MrssFormat extends FormatAbstract {
 			$itemTimestamp = isset($item['timestamp']) ? $this->xml_encode(date(DATE_RFC2822, $item['timestamp'])) : '';
 			$itemContent = isset($item['content']) ? $this->xml_encode($this->sanitizeHtml($item['content'])) : '';
 
-			$entryEnclosure = '';
-			if(isset($item['enclosure'])){
-				$entryEnclosure = '<enclosure url="' . $this->xml_encode($item['enclosure']) . '"/>';
+			$entryEnclosuresWarning = '';
+			$entryEnclosures = '';
+			if(isset($item['enclosures'])){
+				$entryEnclosures .= '<enclosure url="'
+				. $this->xml_encode($item['enclosures'][0])
+				. '"/>';
+
+				if(count($item['enclosures']) > 1){
+					$entryEnclosures .= PHP_EOL;
+					$entryEnclosuresWarning = '&lt;br&gt;Warning:
+Some media files might not be shown to you. Consider using the ATOM format instead!';
+					foreach($item['enclosures'] as $enclosure){
+						$entryEnclosures .= '<atom:link rel="enclosure" href="'
+						. $enclosure . '" />'
+						. PHP_EOL;
+					}
+				}
 			}
 
 			$items .= <<<EOD
@@ -43,9 +57,9 @@ class MrssFormat extends FormatAbstract {
 		<link>{$itemUri}</link>
 		<guid isPermaLink="true">{$itemUri}</guid>
 		<pubDate>{$itemTimestamp}</pubDate>
-		<description>{$itemContent}</description>
+		<description>{$itemContent}{$entryEnclosuresWarning}</description>
 		<author>{$itemAuthor}</author>
-		{$entryEnclosure}
+		{$entryEnclosures}
 	</item>
 
 EOD;