@@ -1806,14 +1806,14 @@
 ;; T I M E   A N D   D A T E
 ;;======================================================================
 
 ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5
 (define (common:hms-string->seconds tstr)
-  (let ((parts     (string-split tstr))
+  (let ((parts     (string-split-fields "\\w+" tstr))
 	(time-secs 0)
-	;; s=seconds, m=minutes, h=hours, d=days
-	(trx       (regexp "(\\d+)([smhd])")))
+	;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks
+	(trx       (regexp "(\\d+)([smhdMyw])")))
     (for-each (lambda (part)
 		(let ((match  (string-match trx part)))
 		  (if match
 		      (let ((val (string->number (cadr match)))
 			    (unt (caddr match)))
@@ -1820,12 +1820,15 @@
 			(if val 
 			    (set! time-secs (+ time-secs (* val
 							    (case (string->symbol unt)
 							      ((s) 1)
 							      ((m) 60)
-							      ((h) (* 60 60))
-							      ((d) (* 24 60 60))
+							      ((h) 3600)
+							      ((d) 86400)
+							      ((2) 604800)
+							      ((M) 2628000) ;; aproximately one month
+							      ((y) 31536000)
 							      (else 0))))))))))
 	      parts)
     time-secs))
 		       
 (define (seconds->hr-min-sec secs)