diff --git a/src/Rl/RlHelper.php b/src/Rl/RlHelper.php
index bd89d7b..0eb08b7 100644
--- a/src/Rl/RlHelper.php
+++ b/src/Rl/RlHelper.php
@@ -88,11 +88,19 @@ class RlHelper implements DateRecurHelperInterface {
             break;
 
           case 'RDATE':
-            $this->set->addDate($value);
+            $rValues = explode(',', $value);
+            foreach ($rValues as $key => $rValue) {
+              $rValue = $this->fixDate($rValue, $dtStart);
+              $this->set->addDate($rValue);
+            }
             break;
 
           case 'EXDATE':
-            $this->set->addExDate($value);
+            $exValues = explode(',', $value);
+            foreach ($exValues as $key => $exValue) {
+              $exValue = $this->fixDate($exValue, $dtStart);
+              $this->set->addExDate($exValue);
+            }
             break;
 
           case 'EXRULE':
@@ -102,6 +110,24 @@ class RlHelper implements DateRecurHelperInterface {
     }
   }
 
+  /**
+   * Set starttime and timezone for ex/r-dates.
+   *
+   * @param string $dateString
+   *   Date to be in-/excluded.
+   * @param \DateTimeInterface $dateStart
+   *   The initial occurrence start date.
+   *
+   * @return \DateTimeZone
+   *   Converted date.
+   */
+  protected function fixDate(string $dateString, \DateTimeInterface $dateStart) {
+    $date = RRule::parseDate($dateString);
+    $date->setTimezone($dateStart->getTimezone());
+    $date->setTime((int) $dateStart->format('H'), (int) $dateStart->format('i'));
+    return $date;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -226,12 +252,12 @@ class RlHelper implements DateRecurHelperInterface {
   /**
    * Get the set.
    *
-   * @return \Drupal\date_recur\Rl\RlRSet
+   * @return \RRule\RSet
    *   Returns the set.
    *
    * @internal this method is specific to rlanvin/rrule implementation only.
    */
-  public function getRlRuleset(): RlRSet {
+  public function getRlRuleset(): RSet {
     return $this->set;
   }
 
diff --git a/tests/src/Unit/DateRecurRlHelperUnitTest.php b/tests/src/Unit/DateRecurRlHelperUnitTest.php
index ebcb660..452feb4 100644
--- a/tests/src/Unit/DateRecurRlHelperUnitTest.php
+++ b/tests/src/Unit/DateRecurRlHelperUnitTest.php
@@ -114,6 +114,19 @@ class DateRecurRlHelperUnitTest extends UnitTestCase {
     $this->assertEquals('DAILY', $rule->getFrequency());
   }
 
+  /**
+   * Tests multiple EXDATE values.
+   */
+  public function testExdate() {
+    $dtStart = new \DateTime('9am 16 June 2014');
+    $rrule = 'RRULE:FREQ=DAILY;COUNT=10';
+    $rrule .= "\nEXDATE:20140617T000000Z,20140618T000000Z";
+    $instance = $this->createHelper($rrule, $dtStart);
+
+    $exdates = $instance->getExDates();
+    $this->assertCount(2, $exdates);
+  }
+
   /**
    * Tests parts that were not passed originally, are not returned.
    */