diff --git a/components/time.inc b/components/time.inc
index 82f95d0..6bbd347 100644
--- a/components/time.inc
+++ b/components/time.inc
@@ -74,10 +74,42 @@ function _webform_edit_time($component) {
     '#weight' => 2,
     '#parents' => array('extra', 'hourformat'),
   );
+  $form['display']['minuteincrements'] = array(
+    '#type' => 'select',
+    '#title' => t('Minute Increments'),
+    '#default_value' => isset($component['extra']['minuteincrements']) ? $component['extra']['minuteincrements'] : 1,
+    '#description' => t('Set the increments of the options in the "minutes" select list'),
+    '#options' => array(
+      1 => t('1 minute'),
+      5 => t('5 minute'),
+      10 => t('10 minute'),
+      15 => t('15 minute'),
+      30 => t('30 minute'),
+    ),
+    '#weight' => 3,
+    '#parents' => array('extra', 'minuteincrements'),
+  );
+
+  $form['#validate'][] = 'webform_validate_time_component';
+
   return $form;
 }

 /**
+ * Validate the time component settings
+ */
+function webform_validate_time_component($form, &$form_state) {
+  // Check that the default value minutes works with the minute increments
+  if ($form_state['values']['value'] > 0 && $form_state['values']['extra']['minuteincrements'] > 1) {
+    $datetime = new DateTime($form_state['values']['value']);
+    $default_values = webform_date_array($datetime->format('c'), 'time');
+    if ($default_values['minute'] % $form_state['values']['extra']['minuteincrements'] != 0) {
+      form_set_error('value', t('The default value\'s minutes doesn\'t match the minute increments. The default time\'s minutes must be a multiple of @minute_increments', array('@minute_increments' => $form_state['values']['extra']['minuteincrements'])));
+    }
+  }
+}
+
+/**
  * Implements _webform_render_component().
  */
 function _webform_render_time($component, $value = NULL, $filter = TRUE) {
@@ -133,7 +165,11 @@ function _webform_render_time($component, $value = NULL, $filter = TRUE) {
   $hours[''] = t('hour');
   $minutes[''] = t('minute');
   for ($i = $first_hour; $i <= $last_hour; $i++) $hours[$i] = $i;
-  for ($i = 0; $i <= 59; $i++) $minutes[$i] = $i < 10 ? "0$i" : $i;
+  for ($i = 0; $i <= 59; $i++) {
+    if ($i % $component['extra']['minuteincrements'] == 0) {
+      $minutes[$i] = $i < 10 ? "0$i" : $i;
+    }
+  }
   $ampms = array('am' => t('am'), 'pm' => t('pm'));

   $element['hour'] = array(