diff --git a/lib/ice_cube/parsers/ical_parser.rb b/lib/ice_cube/parsers/ical_parser.rb
index 2e1e2f05..7387a9ca 100644
--- a/lib/ice_cube/parsers/ical_parser.rb
+++ b/lib/ice_cube/parsers/ical_parser.rb
@@ -37,7 +37,11 @@ def self.rule_from_ical(ical)
         when 'COUNT'
           params[:count] = value.to_i
         when 'UNTIL'
-          params[:until] = Time.parse(value).utc
+          params[:until] = if value =~ /^\d{8}$/
+                             Date.parse(value).to_datetime.to_time
+                           else
+                             Time.parse(value)
+                           end.utc
         when 'WKST'
           params[:wkst] = TimeUtil.ical_day_to_symbol(value)
         when 'BYSECOND'