diff --git a/ChangeLog b/ChangeLog
index 95b6326a5d54d5f056fdc183d3d17cafe3507dc0..c189c90b075594cd64f955966831e3eda4b3e2d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-07  Per Cederqvist  <ceder@ryttargardskyrkan.se>
 
+	Improve the --start-time option.
+	* backup-repeatedly: Exit immediately if the finish or stop file
+	exists, and not after the long wait implied by --start-time.
+	
 	Added support for starting the backups at a predefined time.
 	* backup-repeatedly: New option: --start-time, that specifies the
 	hour and minute when the backup should start.
diff --git a/backup-repeatedly b/backup-repeatedly
index 0d6d7aff413bd3925fbe69f94491e1cb1645d861..e01e84fb4ffe4f51b85252a294bf0d2eaadd80c9 100755
--- a/backup-repeatedly
+++ b/backup-repeatedly
@@ -23,6 +23,9 @@ esac
 	    
 while :
 do
+  [ -f /opt/LYSrdiff/etc/finish ] && break
+  [ -f /opt/LYSrdiff/etc/stop ] && break
+
   if [ -n "$starttime" ]
   then
       if [ -z "`find $LASTSTART -ctime +0 -print 2>/dev/null`" ]
@@ -49,8 +52,6 @@ do
   fi
 
   ctr=`expr $ctr + 1`
-  [ -f /opt/LYSrdiff/etc/finish ] && break
-  [ -f /opt/LYSrdiff/etc/stop ] && break
 
   echo
   echo Running all jobs.  Repeat count: $ctr.