diff --git a/flickr.admin.inc b/flickr.admin.inc
index 9cc7210..9b8be3b 100644
--- a/flickr.admin.inc
+++ b/flickr.admin.inc
@@ -202,6 +202,50 @@ function flickr_admin_settings() {
       'caption' => t('In the photo caption'),
     ),
   );
+  $form['date_formats_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Date formats'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+  // Get list of all available date formats.
+  drupal_static_reset('system_get_date_types');
+  $formats = array();
+  foreach (system_get_date_types() as $f => $format) {
+    if (($format_string = variable_get('date_format_' . $f, FALSE)) === FALSE) {
+      $format_string = key(system_get_date_formats($f));
+    }
+
+    if (!empty($format_string)) {
+      $formats[$f] = $format['title'] . ' [' . format_date(REQUEST_TIME, 'custom', $format_string) . ']';
+    }
+  }
+  $formats['interval'] = 'Time ago [' . format_interval(3600, 1) . ' ago]';
+  $form['date_formats_settings']['flickr_date_format_image_title'] = array(
+    '#type' => 'select',
+    '#title' => t('When hovering an image (mouse-over)'),
+    '#default_value' => variable_get('flickr_date_format_image_title', 'short'),
+    '#options' => $formats,
+  );
+  $form['date_formats_settings']['flickr_date_format_image_caption'] = array(
+    '#type' => 'select',
+    '#title' => t('In the image caption'),
+    '#default_value' => variable_get('flickr_date_format_image_caption', 'interval'),
+    '#options' => $formats,
+  );
+  $form['date_formats_settings']['flickr_date_format_image_caption_hover'] = array(
+    '#type' => 'select',
+    '#title' => t('When hovering a date in the caption'),
+    '#description' => t("If you don't want to display anything when hovering the date, select 'None'."),
+    '#default_value' => variable_get('flickr_date_format_image_caption_hover', 'long'),
+    '#options' => array('none' => '-- None --') + $formats,
+  );
+  $form['date_formats_settings']['flickr_date_format_album_title'] = array(
+    '#type' => 'select',
+    '#title' => t('In the album title'),
+    '#default_value' => variable_get('flickr_date_format_album_title', 'flickr_date_only'),
+    '#options' => $formats,
+  );
   $colorbox_module = l(t('Colorbox module'), 'https://drupal.org/project/colorbox', array(
       'attributes' => array(
         'title' => t('Colorbox| Drupal.org'),
diff --git a/flickr.inc b/flickr.inc
index 49685be..d0bfaf8 100644
--- a/flickr.inc
+++ b/flickr.inc
@@ -310,7 +310,8 @@ function flickr_img($photo, $size = NULL, $attributes = NULL) {
   }
   $info = !is_array($photo['title']) ? flickr_photos_getinfo($photo['id']) : '';
   if (isset($info['dates']) || isset($photo['dates'])) {
-    $taken_short = isset($info['dates']['taken']) ? format_date(strtotime($info['dates']['taken']), 'short', '', NULL) : format_date(strtotime($photo['dates']['taken']), 'short', '', NULL);
+    $date_taken = isset($info['dates']['taken']) ? $info['dates']['taken'] : $photo['dates']['taken'];
+    $taken_short = format_date(strtotime($date_taken), variable_get('flickr_date_format_image_title', 'short'), '', NULL);
   }
   $taken_short = empty($taken_short) ? '' : $taken_short . ' - ';
   $title = is_array($photo['title']) ? str_replace('"', "'", htmlspecialchars_decode(strip_tags($photo['description']['_content']))) : str_replace('"', "'", htmlspecialchars_decode(strip_tags($info['description']['_content'])));
@@ -738,17 +739,16 @@ function flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $siz
 
     $tagged = (empty($tags) || $size == 'x' || $size == 'y') ? '' : '<span class="flickr-tags-wrap">' . $flickr;
     // A single date.
-    if ((empty($datetofix) || $datetofix == $datefromfix) && !empty($datefromfix)) {
-      $str = format_date(strtotime(substr($datefrom, 0, 10)), 'medium', '', NULL);
-      // Remove everthing after the last dash to remove the time.
-      $taken = ' ' . t('taken on') . ' ' . substr($str, 0, strrpos($str, '-'));
+    $format = variable_get('flickr_date_format_album_title', 'short');
+    $formated_datefrom = ($format == 'interval') ? format_interval(time() - strtotime(substr($datefrom, 0, 10)), 1) : format_date(strtotime(substr($datefrom, 0, 10)), $format, '', NULL);
+    $formated_dateto = ($format == 'interval') ? format_interval(time() - strtotime(substr($dateto, 0, 10)), 1) : format_date(strtotime(substr($dateto, 0, 10)), $format, '', NULL);
+
+    if ((empty($datetofix) || $datetofix == $datefromfix || $formated_datefrom == $formated_dateto) && !empty($datefromfix)) {
+      $taken = ($format == 'interval') ? ' ' . t('taken') . ' ' . $formated_datefrom . ' ' . t('ago') : ' ' . t('taken on') . ' ' . $formated_datefrom;
     }
     // Multiple days.
     elseif (!empty($datefromfix)) {
-      // Remove everthing after the last dash to remove the time.
-      $str = format_date(strtotime(substr($datefrom, 0, 10)), 'medium', '', NULL);
-      $strto = format_date(strtotime(substr($dateto, 0, 10)), 'medium', '', NULL);
-      $taken = ' ' . t('taken from') . ' ' . substr($str, 0, strrpos($str, '-')) . ' ' . t('to') . ' ' . substr($strto, 0, strrpos($strto, '-'));
+      $taken = ($format == 'interval') ? ' ' . t('taken') . ' ' . $formated_datefrom . ' ' . t('to') . ' ' . $formated_dateto . ' ' . t('ago') : ' ' . t('taken from') . ' ' . $formated_datefrom . ' ' . t('to') . ' ' . $formated_dateto;
     }
     else {
       $taken = '';
diff --git a/flickr.install b/flickr.install
index e195ccf..284c1d4 100644
--- a/flickr.install
+++ b/flickr.install
@@ -16,6 +16,9 @@ function flickr_install() {
   elseif (module_exists('lightbox2')) {
     variable_set('flickr_rel', 'lightbox[gallery]');
   }
+
+  // Install appropriate date format for album title.
+  flickr_update_7104();
 }
 
 /**
@@ -47,6 +50,10 @@ function flickr_uninstall() {
   variable_del('flickr_maps');
   variable_del('flickr_geophp');
   variable_del('flickr_smart');
+  variable_del('flickr_date_format_image_title');
+  variable_del('flickr_date_format_image_caption');
+  variable_del('flickr_date_format_image_caption_hover');
+  variable_del('flickr_date_format_album_title');
 }
 
 /**
@@ -126,3 +133,39 @@ function flickr_update_7102() {
 function flickr_update_7103() {
   variable_del('flickr_caption_padding');
 }
+
+/**
+ * Create a new date format for album title.
+ */
+function flickr_update_7104() {
+  drupal_static_reset('system_get_date_types');
+  foreach (system_get_date_types() as $f => $format) {
+    if (($format_string = variable_get('date_format_' . $f, FALSE)) === FALSE) {
+      $format_string = key(system_get_date_formats($f));
+    }
+
+    // There is already a date format without hours.
+    if (strpos(strtolower($format_string), 'h') === FALSE && strpos(strtolower($format_string), 'g') === FALSE) {
+      variable_set('flickr_date_format_album_title', $f);
+    }
+  }
+
+  // There is no date format defined using the expected format. Create it.
+  if (variable_get('flickr_date_format_album_title', FALSE) === FALSE) {
+    system_date_format_save(array(
+      'type' => 'custom',
+      'format' => 'l, d F, Y',
+      'locked' => 0,
+      'is_new' => 1,
+    ));
+    system_date_format_type_save(array(
+      'type' => 'flickr_date_only',
+      'title' => 'Date only',
+      'locked' => 0,
+      'is_new' => 1
+    ));
+    variable_set('date_format_flickr_date_only', 'l, d F, Y');
+
+    variable_set('flickr_date_format_album_title', 'flickr_date_only');
+  }
+}
diff --git a/flickr.module b/flickr.module
index e997d28..8d717bf 100644
--- a/flickr.module
+++ b/flickr.module
@@ -615,8 +615,28 @@ function theme_flickr_photo($variables) {
   // Real name if it exists else the username. Link to Flickr profile page.
   // Replace with $people['photostream'] if you want to link to the photostream.
   $username = $people['name'];
-  // The date an image was taken formatted as 'time ago'.
-  $taken = isset($info['dates']['taken']) ? '<a title="' . format_date(strtotime($info['dates']['taken']), 'long', '', NULL) . '">' . format_interval(time() - strtotime($info['dates']['taken']), 1) . '</a> ' . t('ago') : '';
+  // The date an image was taken.
+  $taken = '';
+  if (isset($info['dates']['taken'])) {
+    // Format the date displayed on image caption.
+    $format_taken = variable_get('flickr_date_format_image_caption', 'interval');
+    $taken = ($format_taken == 'interval') ? format_interval(time() - strtotime($info['dates']['taken']), 1) : format_date(strtotime($info['dates']['taken']), $format_taken, '', NULL);
+    // Format the date displayed when hovering the date on image caption.
+    $format_hover = variable_get('flickr_date_format_image_caption_hover', 'long');
+    switch ($format_hover) {
+      case 'interval':
+        $taken_hover = format_interval(time() - strtotime($info['dates']['taken']), 1) . ' ' . t('ago');
+        break;
+      case 'none':
+        $taken_hover = '';
+        break;
+      default:
+        $taken_hover = format_date(strtotime($info['dates']['taken']), $format_hover, '', NULL);
+    }
+    // Finalize the formatting.
+    $taken = (empty($taken_hover)) ? $taken : '<a title="' . $taken_hover . '">' . $taken . '</a>';
+    $taken .= ($format_taken == 'interval') ? ' ' . t('ago') : '';
+  }
   // A bunch of geo data.
   $neighbourhood = isset($info['location']['neighbourhood']['_content']) ? strip_tags($info['location']['neighbourhood']['_content']) . ', ' : '';
   $locality = isset($info['location']['locality']['_content']) ? strip_tags($info['location']['locality']['_content']) . ', ' : '';
