diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 3bfd3e23..c69eb7f7 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -20,12 +20,16 @@
 	{% for post in recent_posts %}
 		<div class="thread">
 			<a href="{{post.link}}">
+			{% if post.youtube %}
+                                <img src="http://img.youtube.com/vi/{{ post.youtube }}/0.jpg" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
+			{% elseif post.file %}
 				<img src="{{post.file}}" class="{{post.board}}" title="{{post.bump|date('%b %d %H:%M')}}">
-			</a>
+			{% endif %}
 			<span class="replies">
 				<strong>{% trans %}1 reply{% plural post.reply_count %}{{ count }} replies{% endtrans %}</strong><br/>
 				{{ post.body }}
 			</span>
+			</a>
 		</div>
 	{% endfor %}
 	</ul>
diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index d3a837ca..5d391536 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -41,6 +41,11 @@
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
 				$post['board_name'] = $board['name'];
 				$post['file'] = $config['uri_thumb'] . $post['thumb'];
+
+				if ($post['embed'] && preg_match('/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i', $post['embed'], $matches)) {
+					$post['youtube'] = $matches[2];
+				}				
+
 				$recent_posts[] = $post;
 			}