diff --git a/core/modules/datetime/config/schema/datetime.schema.yml b/core/modules/datetime/config/schema/datetime.schema.yml
index 406a2fd..4fe710d 100644
--- a/core/modules/datetime/config/schema/datetime.schema.yml
+++ b/core/modules/datetime/config/schema/datetime.schema.yml
@@ -7,6 +7,9 @@ field.storage_settings.datetime:
     datetime_type:
       type: string
       label: 'Date type'
+    enddate_get:
+      type: string
+      label: 'Collect end date'
 
 field.field_settings.datetime:
   type: mapping
diff --git a/core/modules/datetime/datetime.install b/core/modules/datetime/datetime.install
new file mode 100644
index 0000000..3c5bc2d
--- /dev/null
+++ b/core/modules/datetime/datetime.install
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the datetime module.
+ */
+
+/**
+ * Add 'enddate_get' field to 'field.storage_settings.datetime'.
+ */
+function datetime_update_8001() {
+  if (!$field_storage_configs = \Drupal::entityManager()->getStorage('field_storage_config')->loadByProperties(array('type' => 'datetime'))) {
+    return;
+  }
+
+  foreach ($field_storage_configs as $field_storage) {
+    $field_storage->setSetting('enddate_get', FALSE);
+    $field_storage->save();
+  }
+}
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
index 5b53a8f..69e6612 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeCustomFormatter.php
@@ -53,6 +53,21 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
 
         $output = $this->formatDate($date);
       }
+      if (!empty($item->date2)) {
+        /** @var \Drupal\Core\Datetime\DrupalDateTime $date */
+        $date2 = $item->date2;
+
+        if ($this->getFieldSetting('datetime_type') == 'date') {
+          // A date without time will pick up the current time, use the default.
+          datetime_date_default_time($date2);
+        }
+        $this->setTimeZone($date2);
+
+        $output = $this->t('@date to @date2', [
+          '@date' => $this->formatDate($date),
+          '@date2' => $this->formatDate($date2),
+        ]);
+      }
       $elements[$delta] = [
         '#markup' => $output,
         '#cache' => [
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
index 9b2735c..a1637a9 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
@@ -42,6 +42,8 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     foreach ($items as $delta => $item) {
       $output = '';
       $iso_date = '';
+      $output2 = '';
+      $iso_date2 = '';
 
       if ($item->date) {
         /** @var \Drupal\Core\Datetime\DrupalDateTime $date */
@@ -58,20 +60,55 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
         $output = $this->formatDate($date);
       }
 
+      if ($item->date2) {
+        /** @var \Drupal\Core\Datetime\DrupalDateTime $date */
+        $date2 = $item->date2;
+        // Create the ISO date in Universal Time.
+        $iso_date2 = $date->format("Y-m-d\TH:i:s") . 'Z';
+
+        if ($this->getFieldSetting('datetime_type') == 'date') {
+          // A date without time will pick up the current time, use the default.
+          datetime_date_default_time($date2);
+        }
+        $this->setTimeZone($date2);
+
+        $output2 = $this->formatDate($date2);
+      }
+
       // Display the date using theme datetime.
-      $elements[$delta] = array(
+      $elements[$delta] = [
         '#cache' => [
           'contexts' => [
             'timezone',
           ],
         ],
-        '#theme' => 'time',
-        '#text' => $output,
-        '#html' => FALSE,
-        '#attributes' => array(
-          'datetime' => $iso_date,
-        ),
-      );
+        [
+          '#theme' => 'time',
+          '#text' => $output,
+          '#html' => FALSE,
+          '#attributes' => ['datetime' => $iso_date],
+        ],
+      ];
+
+      // Append on the end date.
+      if ($this->getFieldSetting('enddate_get')) {
+        $elements[$delta][] = [
+          '#markup' => $this->t(' to '),
+        ];
+        $elements[$delta][] = [
+          '#cache' => [
+            'contexts' => [
+              'timezone',
+            ],
+          ],
+          [
+            '#theme' => 'time',
+            '#text' => $output2,
+            '#html' => FALSE,
+            '#attributes' => ['datetime' => $iso_date2],
+          ],
+        ];
+      }
       if (!empty($item->_attributes)) {
         $elements[$delta]['#attributes'] += $item->_attributes;
         // Unset field item attributes since they have been included in the
diff --git a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
index c22445e..8ba7df7 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php
@@ -30,6 +30,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
 
     foreach ($items as $delta => $item) {
       $output = '';
+
       if (!empty($item->date)) {
         /** @var \Drupal\Core\Datetime\DrupalDateTime $date */
         $date = $item->date;
@@ -38,12 +39,25 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
           // A date without time will pick up the current time, use the default.
           datetime_date_default_time($date);
         }
-        else {
-        }
-        $this->setTimeZone($date);
 
         $output = $this->formatDate($date);
       }
+
+      if (!empty($item->date2)) {
+        /** @var \Drupal\Core\Datetime\DrupalDateTime $date */
+        $date2 = $item->date2;
+
+        if ($this->getFieldSetting('datetime_type') == 'date') {
+          // A date without time will pick up the current time, use the default.
+          datetime_date_default_time($date2);
+        }
+
+        $output = $this->t('@date to @date2', [
+          '@date' => $this->formatDate($date),
+          '@date2' => $this->formatDate($date2),
+        ]);
+      }
+
       $elements[$delta] = [
         '#cache' => [
           'contexts' => [
diff --git a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
index 3998900..5281ef6 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
@@ -111,6 +111,10 @@ public static function processDefaultValue($default_value, FieldableEntityInterf
           'date' => $date,
         )
       );
+      if ($definition->getSetting('enddate_get')) {
+        $default_value[0]['value2'] = $value;
+        $default_value[0]['date2'] = $date;
+      }
     }
     return $default_value;
   }
diff --git a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
index a7dd1c3..119e381 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
@@ -33,6 +33,7 @@ class DateTimeItem extends FieldItemBase {
   public static function defaultStorageSettings() {
     return array(
       'datetime_type' => 'datetime',
+      'enddate_get' => FALSE,
     ) + parent::defaultStorageSettings();
   }
 
@@ -50,17 +51,30 @@ public static function defaultStorageSettings() {
    * {@inheritdoc}
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    $has_end = $field_definition->getSetting('enddate_get');
+
     $properties['value'] = DataDefinition::create('datetime_iso8601')
-      ->setLabel(t('Date value'))
+      ->setLabel($has_end ? t('Date value (start)') : t('Date value'))
       ->setRequired(TRUE);
 
     $properties['date'] = DataDefinition::create('any')
-      ->setLabel(t('Computed date'))
-      ->setDescription(t('The computed DateTime object.'))
+      ->setLabel($has_end ? t('Computed date (start)') : t('Computed date'))
+      ->setDescription(t('The computed start DateTime object.'))
       ->setComputed(TRUE)
       ->setClass('\Drupal\datetime\DateTimeComputed')
       ->setSetting('date source', 'value');
 
+    $properties['value2'] = DataDefinition::create('datetime_iso8601')
+      ->setLabel(t('Date value (end)'))
+      ->setRequired($has_end);
+
+    $properties['date2'] = DataDefinition::create('any')
+      ->setLabel(t('Computed date (end)'))
+      ->setDescription(t('The computed end DateTime object.'))
+      ->setComputed(TRUE)
+      ->setClass('\Drupal\datetime\DateTimeComputed')
+      ->setSetting('date source', 'value2');
+
     return $properties;
   }
 
@@ -68,18 +82,26 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
    * {@inheritdoc}
    */
   public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    return array(
+    $schema = array(
       'columns' => array(
         'value' => array(
-          'description' => 'The date value.',
+          'description' => 'The start date value.',
+          'type' => 'varchar',
+          'length' => 20,
+        ),
+        'value2' => array(
+          'description' => 'The end date value.',
           'type' => 'varchar',
           'length' => 20,
         ),
       ),
       'indexes' => array(
         'value' => array('value'),
+        'value2' => array('value2'),
       ),
     );
+
+    return $schema;
   }
 
   /**
@@ -94,11 +116,18 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
       '#description' => t('Choose the type of date to create.'),
       '#default_value' => $this->getSetting('datetime_type'),
       '#options' => array(
+        static::DATETIME_TYPE_DATE => t('Date (all day)'),
         static::DATETIME_TYPE_DATETIME => t('Date and time'),
-        static::DATETIME_TYPE_DATE => t('Date only'),
       ),
     );
 
+    $element['enddate_get'] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Collect an end date'),
+      '#default_value' => $this->getSetting('enddate_get'),
+      '#disabled' => $has_data,
+    );
+
     return $element;
   }
 
@@ -107,15 +136,22 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
    */
   public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
     $type = $field_definition->getSetting('datetime_type');
+    $collect_end_date = $field_definition->getSetting('enddate_get');
 
     // Just pick a date in the past year. No guidance is provided by this Field
     // type.
     $timestamp = REQUEST_TIME - mt_rand(0, 86400*365);
     if ($type == DateTimeItem::DATETIME_TYPE_DATE) {
       $values['value'] = gmdate(DATETIME_DATE_STORAGE_FORMAT, $timestamp);
+      if ($collect_end_date) {
+        $values['value2'] = gmdate(DATETIME_DATE_STORAGE_FORMAT, $timestamp + 86400);
+      }
     }
     else {
       $values['value'] = gmdate(DATETIME_DATETIME_STORAGE_FORMAT, $timestamp);
+      if ($collect_end_date) {
+        $values['value2'] = gmdate(DATETIME_DATETIME_STORAGE_FORMAT, $timestamp + 86400);
+      }
     }
     return $values;
   }
@@ -136,6 +172,9 @@ public function onChange($property_name, $notify = TRUE) {
     if ($property_name == 'value') {
       $this->date = NULL;
     }
+    if ($property_name == 'value2') {
+      $this->date2 = NULL;
+    }
     parent::onChange($property_name, $notify);
   }
 
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
index 3e4a2ef..ee2a301 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
@@ -83,6 +83,14 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#date_part_order'=> $date_part_order,
     ) + $element['value'];
 
+    if ($this->getFieldSetting('enddate_get')) {
+      $element['value2'] = array(
+          '#type' => 'datelist',
+          '#date_increment' => $increment,
+          '#date_part_order'=> $date_part_order,
+        ) + $element['value'];
+    }
+
     return $element;
   }
 
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
index 8d436a0..7be4a0d 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDefaultWidget.php
@@ -89,6 +89,17 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#date_time_callbacks' => array(),
     );
 
+    if ($this->getFieldSetting('enddate_get')) {
+      $element['value2'] += array(
+        '#date_date_format'=>  $date_format,
+        '#date_date_element' => $date_type,
+        '#date_date_callbacks' => array(),
+        '#date_time_format' => $time_format,
+        '#date_time_element' => $time_type,
+        '#date_time_callbacks' => array(),
+      );
+    }
+
     return $element;
   }
 
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
index dfe750e..f3afe5a 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
@@ -52,6 +52,32 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       $element['value']['#default_value'] = $date;
     }
 
+    if ($this->getFieldSetting('enddate_get')) {
+      $element['value']['#title'] = t('Start date');
+
+      $element['value2'] = array(
+        '#title' => t('End date'),
+        '#type' => 'datetime',
+        '#default_value' => NULL,
+        '#date_increment' => 1,
+        '#date_timezone' => drupal_get_user_timezone(),
+        '#required' => $element['#required'],
+      );
+
+      if ($items[$delta]->date2) {
+        $date = $items[$delta]->date2;
+        // The date was created and verified during field_load(), so it is safe to
+        // use without further inspection.
+        if ($this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE) {
+          // A date without time will pick up the current time, use the default
+          // time.
+          datetime_date_default_time($date);
+        }
+        $date->setTimezone(new \DateTimeZone($element['value2']['#date_timezone']));
+        $element['value2']['#default_value'] = $date;
+      }
+    }
+
     return $element;
   }
 
@@ -62,9 +88,22 @@ public function massageFormValues(array $values, array $form, FormStateInterface
     // The widget form element type has transformed the value to a
     // DrupalDateTime object at this point. We need to convert it back to the
     // storage timezone and format.
+    $properties = array('value');
+    if ($this->getFieldSetting('enddate_get')) {
+      $properties[] = 'value2';
+    }
     foreach ($values as &$item) {
-      if (!empty($item['value']) && $item['value'] instanceof DrupalDateTime) {
-        $date = $item['value'];
+      foreach ($properties as $property) {
+        if (!empty($item[$property]) && $item[$property] instanceof DrupalDateTime) {
+          $this->massageDateProperty($item, $property);
+        }
+      }
+    }
+    return $values;
+  }
+
+  public function massageDateProperty(&$item, $property) {
+    $date = $item[$property];
         switch ($this->getFieldSetting('datetime_type')) {
           case DateTimeItem::DATETIME_TYPE_DATE:
             // If this is a date-only field, set it to the default time so the
@@ -79,10 +118,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
         }
         // Adjust the date for storage.
         $date->setTimezone(new \DateTimezone(DATETIME_STORAGE_TIMEZONE));
-        $item['value'] = $date->format($format);
-      }
-    }
-    return $values;
-  }
+    $item[$property] = $date->format($format);
 
+  }
 }
diff --git a/core/modules/datetime/src/Tests/DateTimeItemTest.php b/core/modules/datetime/src/Tests/DateTimeItemTest.php
index d83d2a2..6394cae 100644
--- a/core/modules/datetime/src/Tests/DateTimeItemTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeItemTest.php
@@ -9,6 +9,8 @@
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FieldItemInterface;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\field\Tests\FieldUnitTestBase;
 
 /**
@@ -122,4 +124,25 @@ public function testSetValueProperty() {
     $this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
   }
 
+  /**
+   * Tests collecting an end date.
+   */
+  public function testEnddate() {
+    /** @var \Drupal\field\FieldStorageConfigInterface $field_storage */
+    $field_storage = FieldStorageConfig::load('entity_test.field_datetime');
+    $field_storage->setSetting('enddate_get', TRUE);
+    $field_storage->save();
+
+    $entity = EntityTest::create();
+    $value = '2014-01-01T20:00:00Z';
+    $value2 = '2014-02-01T20:00:00Z';
+
+    $entity->set('field_datetime', ['value' => $value, 'value2' => $value2]);
+    $entity->save();
+
+    // Load the entity.
+    $id = $entity->id();
+    $entity = EntityTest::load($id);
+    $this->assertEqual($value2, $entity->field_datetime[0]->value2, '"end date" property can be set.');
+  }
 }