diff --git a/date.module b/date.module
index 91c0b65..785a0a4 100644
--- a/date.module
+++ b/date.module
@@ -97,6 +97,7 @@ function date_theme() {
         'add_rdf' => NULL,
         'microdata' => NULL,
         'add_microdata' => NULL,
+        'display_wrapper' => NULL,
     )),
     'date_display_combination' => $base + array(
       'variables' => array(
diff --git a/date.theme b/date.theme
index a1f7d93..cef9445 100644
--- a/date.theme
+++ b/date.theme
@@ -186,6 +186,7 @@ function theme_date_display_combination($variables) {
       'microdata' => $microdata,
       'add_microdata' => $add_microdata,
       'dates' => $dates,
+      'display_wrapper' => FALSE,
     ));
     $replaced = str_replace($time1, $time, $date1);
     $output .= theme('date_display_single', array(
@@ -209,6 +210,7 @@ function theme_date_display_combination($variables) {
       'microdata' => $microdata,
       'add_microdata' => $add_microdata,
       'dates' => $dates,
+      'display_wrapper' => TRUE,
     ));
   }
 
@@ -259,7 +261,7 @@ function theme_date_display_single($variables) {
   $attributes = $variables['attributes'];
 
   // Wrap the result with the attributes.
-  $output = '<span class="date-display-single"' . drupal_attributes($attributes) . '>' . $date . $timezone . '</span>';
+  $output = '<span class="date-display-wrapper date-display-single"' . drupal_attributes($attributes) . '>' . $date . $timezone . '</span>';
 
   if (!empty($variables['add_microdata'])) {
     $output .= '<meta' . drupal_attributes($variables['microdata']['value']['#attributes']) . '/>';
@@ -326,10 +328,16 @@ function theme_date_display_range($variables) {
   }
 
   // Wrap the result with the attributes.
-  return t('!start-date to !end-date', array(
+  $output = t('!start-date to !end-date', array(
     '!start-date' => $start_date,
     '!end-date' => $end_date,
   ));
+
+  if(!empty($variables['display_wrapper'])) {
+    $output = '<span class="date-display-wrapper">' . $output . '</span>';
+  }
+
+  return $output;
 }
 
 /**
@@ -355,7 +363,7 @@ function theme_date_display_interval($variables) {
   );
 
   if ($return = theme('date_time_ago', $time_ago_vars)) {
-    return '<span class="date-display-interval"' . drupal_attributes($attributes) . ">$return</span>";
+    return '<span class="date-display-wrapper date-display-interval"' . drupal_attributes($attributes) . ">$return</span>";
   }
   else {
     return '';