diff --git a/date.theme b/date.theme
index 5b56201..43204cc 100644
--- a/date.theme
+++ b/date.theme
@@ -402,7 +402,7 @@ function theme_date_combo($variables) {
   $fieldset = array(
     '#title' => field_filter_xss(t($element['#title'])) . ' ' . ($element['#delta'] > 0 ? intval($element['#delta'] + 1) : ''),
     '#value' => '',
-    '#description' => !empty($element['#fieldset_description']) ? $element['#fieldset_description'] : '',
+    '#description' => !empty($element['#description']) ? t($element['#description']) : '',
     '#attributes' => array('class' => array('date-combo')),
     '#children' => $element['#children'],
   );
diff --git a/date_elements.inc b/date_elements.inc
index f99f213..656d499 100644
--- a/date_elements.inc
+++ b/date_elements.inc
@@ -337,8 +337,11 @@ function date_combo_element_process($element, &$form_state, $form) {
     '#date_label_position' => $instance['widget']['settings']['label_position'],
   );
 
-  $description = !empty($element['#description']) ? t($element['#description']) : '';
-  unset($element['#description']);
+  // Date repeat is a multiple value field. So the description is removed from
+  // the single element earlier. Let's get it back.
+  if (isset($element['show_repeat_settings']) && !empty($element['value']['#instance']['description'])) {
+    $element['#description'] = $element['value']['#instance']['description'];
+  }
 
   // Give this element the right type, using a Date API
   // or a Date Popup element type.
@@ -383,8 +386,7 @@ function date_combo_element_process($element, &$form_state, $form) {
     $element[$to_field]['#prefix'] = '';
     // Users with JS enabled will never see initially blank values for the end
     // date (see Drupal.date.EndDateHandler()), so hide the message for them.
-    $description .= '<span class="js-hide"> ' . t("Empty 'End date' values will use the 'Start date' values.") . '</span>';
-    $element['#fieldset_description'] = $description;
+    $element['#description'] .= '<span class="js-hide"> ' . t("Empty 'End date' values will use the 'Start date' values.") . '</span>';
     if ($field['settings']['todate'] == 'optional') {
       $element[$to_field]['#states'] = array(
         'visible' => array(
@@ -395,9 +397,6 @@ function date_combo_element_process($element, &$form_state, $form) {
       );
     }
   }
-  else {
-    $element[$from_field]['#description'] = $description;
-  }
 
   // Create label for error messages that make sense in multiple values
   // and when the title field is left blank.