diff --git a/backupninja b/backupninja
index 3943724d3449c0ef12b02eaaf9fd7553c2522ac1..a59d40067c9eafa3be4e183ee2d0f34ef2b34c9f 100755
--- a/backupninja
+++ b/backupninja
@@ -199,9 +199,9 @@ function isnow() {
 	whendayofweek=$1; at=$2; whentime=$3;
 	whenday=`toint "$whendayofweek"`
 	whendayofweek=`tolower "$whendayofweek"`
-	whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//'`
+	whentime=`echo "$whentime" | sed 's/:[0-9][0-9]$//' | sed -r 's/^([0-9])$/0\1/'`
 
-	if [ "$whendayofweek" == "everyday" ]; then
+	if [ "$whendayofweek" == "everyday" -o "$whendayofweek" == "daily" ]; then
 		whendayofweek=$nowdayofweek
 	fi
 
diff --git a/changelog b/changelog
index 520b7b6db7291d91f570b00de80f8c8415a9c72a..bf891cd60b1d4f39add8fc3aa0f52d2d4f3b7180 100644
--- a/changelog
+++ b/changelog
@@ -3,10 +3,10 @@ version 0.5 -- April 12 2005
     rdiff handler supports local dest 
     logfile is created if it doesn't exist
     added "when = hourly" 
-xxxx   fixed bug with 'when' option
-    added 'nice' to rdiff handler
+    added optional 'nicelevel' to rdiff handler
     fixed bug where actions were not run in numeric order.
-    
+    improved 'when' parsing.
+        
 version 0.4.4 -- March 18 2005
 	results of handlers are now read line by line. 
 	changes to rdiff handler: added "options", and "keep" is