diff --git a/framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php b/framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php
index 8344840..acd2260 100644
--- a/framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php
+++ b/framework/Icalendar/lib/Horde/Icalendar/Vtimezone.php
@@ -151,6 +151,11 @@ class Horde_Icalendar_Vtimezone extends Horde_Icalendar
         }
 
         // Get the timestamp for the first day of $month.
+        // If RRULE contains UNTIL use the year therein for calculation
+        // otherwise use the year of VEVENT
+	if ($result['end']) {
+	    $year = $result['end'];
+	}
         $when = gmmktime($start['hours'], $start['minutes'], $start['seconds'],
                          $month, 1, $year);
         // Get the day of the week for the first day of $month.