diff --git a/date.theme b/date.theme
index 6ea615a..0140601 100644
--- a/date.theme
+++ b/date.theme
@@ -308,6 +308,14 @@ function theme_date_display_interval($variables) {
  */
 function theme_date_combo($variables) {
   $element = $variables['element'];
+
+  // If no_fieldset is checked, return the element without the fieldset around it
+  if (isset($element['value']['#instance']['widget']['settings']['no_fieldset']) &&
+      $element['value']['#instance']['widget']['settings']['no_fieldset'])
+  {
+    return $element['#children'];
+  }
+
   $field = field_info_field($element['#field_name']);
   $instance = field_info_instance($element['#entity_type'], $element['#field_name'], $element['#bundle']);
 
diff --git a/date_admin.inc b/date_admin.inc
index 7f393ff..c39ffa5 100644
--- a/date_admin.inc
+++ b/date_admin.inc
@@ -293,6 +293,12 @@ function _date_field_widget_settings_form($field, $instance) {
       '#type' => 'hidden',
       '#value' => '',
     );
+    $form['no_fieldset'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Do not wrap field in a fieldset'),
+      '#default_value' => $settings['no_fieldset'],
+      '#description' => t('Render this field without a fieldset wrapped around it.'),
+    );
   }
 
   if (in_array($widget['type'], array('date_select', 'date_popup'))) {
diff --git a/date_popup/date_popup.module b/date_popup/date_popup.module
index 65f9caa..d279fcb 100644
--- a/date_popup/date_popup.module
+++ b/date_popup/date_popup.module
@@ -355,6 +355,12 @@ function date_popup_process_date_part(&$element) {
   // TODO, figure out exactly when we want this description. In many places it is not desired.
   $sub_element['#description'] = ' '. t('E.g., @date', array('@date' => date_format_date(date_now(), 'custom', date_popup_date_format($element))));
 
+  // For Do not wrap in a fieldset, use main label for date field
+  if (isset($element['#instance']['widget']['settings']['no_fieldset']) &&
+      $element['#instance']['widget']['settings']['no_fieldset']) {
+    $sub_element['#title'] = $element['#date_title'];
+  }
+
   return $sub_element;
 }
 
@@ -658,6 +664,13 @@ function theme_date_popup($vars) {
   if (empty($element['date']['#description'])) {
     $wrapper_attributes['class'][] = 'clearfix';
   }
+
+  // If no_fieldset is checked, return the element without being wrapped in a fieldset
+  if (isset($element['#instance']['widget']['settings']['no_fieldset'])
+      && $element['#instance']['widget']['settings']['no_fieldset']) {
+    return $element['#children'];
+  }
+
   // Add an wrapper to mimic the way a single value field works, for ease in using #states.
   if (isset($element['#children'])) {
     $element['#children'] = '<div id="' . $element['#id'] . '" ' . drupal_attributes($wrapper_attributes) .'>' . $element['#children'] . '</div>';