diff --git a/HISTORY b/HISTORY
index 970bb65a..0f564cc5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -110,3 +110,4 @@ Video Disk Recorder Revision History
   disks).
 - Fixed learning key codes for PC keyboard.
 - New command line option '-l' to set the log level.
+- Times in timers.conf are now always printed with 4 digits (leading '0').
diff --git a/config.c b/config.c
index 6b5e0493..8890c694 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.15 2000/07/25 16:21:20 kls Exp $
+ * $Id: config.c 1.16 2000/07/29 19:09:51 kls Exp $
  */
 
 #include "config.h"
@@ -294,7 +294,7 @@ cTimer& cTimer::operator= (const cTimer &Timer)
 
 const char *cTimer::ToText(cTimer *Timer)
 {
-  asprintf(&buffer, "%d:%d:%s:%d:%d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
+  asprintf(&buffer, "%d:%d:%s:%04d:%04d:%d:%d:%s:%s\n", Timer->active, Timer->channel, PrintDay(Timer->day), Timer->start, Timer->stop, Timer->priority, Timer->lifetime, Timer->file, Timer->summary ? Timer->summary : "");
   return buffer;
 }
 
diff --git a/timers.conf b/timers.conf
index 659faaaf..47b40674 100644
--- a/timers.conf
+++ b/timers.conf
@@ -1,9 +1,13 @@
-1:10:-T-----:2058:2202:99:10:Quarks:
-1:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
+0:10:-T-----:2058:2202:99:10:Quarks:
+0:5:-T-----:2100:2205:99:10:RudisSuchmaschine:
 1:10:---T---:2158:2250:99:99:DiePlaneten:
-1:3:---T---:2211:2300:99:10:Switch:
+0:3:---T---:2211:2300:99:10:Switch:
 1:15:-----S-:1358:1435:99:7:Neues:
-1:1:-----S-:1445:1600:99:30:Hammerman:
+1:1:-----S-:1445:1610:99:30:Hammerman:
 0:2:-----S-:2200:2350:99:30:Wochenshow:
 1:11:------S:2058:2120:99:10:Centauri:
 0:15:MTWTF--:1828:1901:10:5:nano:
+1:1:-TWTF--:0858:0940:99:99:Ellen:
+1:2:----F--:2140:2225:10:10:WWW:
+1:11:-----S-:2158:2235:99:99:Computer:
+1:23:-----S-:2200:0020:99:99:BBC special: