diff --git a/youtube.module b/youtube.module
index 3bdd7d8..4cd152c 100644
--- a/youtube.module
+++ b/youtube.module
@@ -137,7 +137,7 @@ function youtube_field_formatter_info() {
     'youtube_thumbnail' => array(
       'label' => t('YouTube thumbnail'),
       'field types' => array('youtube'),
-      'settings' => array('image_style' => 'thumbnail'),
+      'settings' => array('image_style' => 'thumbnail', 'image_link' => ''),
     ),
   );
 
@@ -168,6 +168,18 @@ function youtube_field_formatter_settings_form($field, $instance, $view_mode, $f
       '#default_value' => $settings['image_style'],
       '#empty_option' => t('None (original image)'),
     );
+    // Option to link the thumbnail to either it's original node or original youtube video.
+    $link_types = array(
+      'content' => t('Content'),
+      'file' => t('Youtube'),
+    );
+    $element['image_link'] = array(
+      '#title' => t('Link image to'),
+      '#type' => 'select',
+      '#default_value' => $settings['image_link'],
+      '#empty_option' => t('Nothing'),
+      '#options' => $link_types,
+    );
   }
 
   return $element;
@@ -203,6 +215,14 @@ function youtube_field_formatter_settings_summary($field, $instance, $view_mode)
     else {
       $summary = t('Original image');
     }
+    $link_types = array(
+	 	'content' => t('Linked to content'),
+	 	'file' => t("Linked to it's Youtube page"),
+	 );
+	 // Display this setting only if image is linked.
+	 if (isset($settings['image_link'])&&isset($link_types[$settings['image_link']])) {
+	 	$summary.= '<br />'.$link_types[$settings['image_link']];
+	 }
     return $summary;
   }
 }
@@ -213,6 +233,16 @@ function youtube_field_formatter_settings_summary($field, $instance, $view_mode)
 function youtube_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
 
+  if(isset($display['settings']['image_link'])){
+    // Check if the formatter involves a link.
+	 if ($display['settings']['image_link'] == 'content') {
+	   $uri = entity_uri($entity_type, $entity);
+	 }
+	 elseif ($display['settings']['image_link'] == 'file') {
+	   $link_file = TRUE;
+	 }
+  }
+
   switch ($display['type']) {
     // This formatter outputs the youtube embed code.
     case 'youtube_video':
@@ -228,10 +258,18 @@ function youtube_field_formatter_view($entity_type, $entity, $field, $instance,
     // This formatter uses an imagecache preset to generate a thumbnail.
     case 'youtube_thumbnail':
       foreach ($items as $delta => $item) {
+        // If the thumbnail is linked to it's youtube page, take the original url.
+        if (isset($link_file)) {
+		    $uri = array(
+		      'path' => $item['input'],
+		      'options' => array(),
+		    );
+		  }
         $element[$delta] = array(
           '#theme' => 'youtube_thumbnail',
           '#video_id' => $item['video_id'],
           '#image_style' => $display['settings']['image_style'],
+          '#path' => isset($uri) ? $uri : '',
         );
       }
       break;
@@ -336,7 +374,7 @@ function youtube_field_widget_error($element, $error, $form, &$form_state) {
 function youtube_theme($existing, $type, $theme, $path) {
   return array(
     'youtube_thumbnail' => array(
-      'variables' => array('video_id' => NULL, 'image_style' => NULL),
+      'variables' => array('video_id' => NULL, 'image_style' => NULL, 'path' => NULL),
       'file' => 'youtube.theme.inc',
     ),
     'youtube_video' => array(
diff --git a/youtube.theme.inc b/youtube.theme.inc
index da8e19e..7b93cd9 100644
--- a/youtube.theme.inc
+++ b/youtube.theme.inc
@@ -95,6 +95,15 @@ function theme_youtube_thumbnail($variables) {
     $path = $files . '/' . $youtube . '/' . $id . '.png';
     $image = theme('image', array('path' => $path));
   }
+  
+  // Check if an url path is provided
+  if(!empty($variables['path']['path'])){
+  	 $url_path = $variables['path']['path'];
+    $options = $variables['path']['options'];
+    // When displaying an image inside a link, the html option must be TRUE.
+    $options['html'] = TRUE;
+    $image = l($image, $url_path, $options);
+  }
 
   return $image;
 }
\ No newline at end of file