diff --git a/lib/olson.php b/lib/olson.php
index f23fc7fd0a1..5cf534e69b2 100644
--- a/lib/olson.php
+++ b/lib/olson.php
@@ -242,12 +242,10 @@ function olson_simple_rule_parser ($filename) {
 
         $srs = ($save === '0') ? 'reset' : 'set';
 
-        if($to == 'only') {
+        if($to == 'only' || $to == 'max') {
+            // In both cases, a single entry for one year will suffice
             $to = $from;
         }
-        else if($to == 'max') {
-            $to = intval(date('Y'));
-        }
 
         for($i = $from; $i <= $to; ++$i) {
             $rules[$name][$i][$srs] = $rule;