diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 31a0222c..a946dd0f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -483,6 +483,8 @@ Oliver Lorei <oliverlorei@cityweb.de>
 Andreas Böttger <fboettger@t-online.de>
  for reporting a bug in skipping forward in time shift mode near the end of the recording
  for fixing setting system time to avoid time jumps in case of faulty data
+ for reporting a bug in the "Day" field of the "Edit timer" menu when pressing
+ '0' to switch from "single shot" to "weekly", followed by the "Right" key
 
 Onno Kreuzinger <ok@solutas.net>
  for reporting leftover references to the file FORMATS in MANUAL and svdrp.c
diff --git a/HISTORY b/HISTORY
index 240f8425..047b3048 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3963,7 +3963,7 @@ Video Disk Recorder Revision History
   commands may now be executed at any time, and the message will be displayed
   (no more "pending message").
 
-2006-01-05: Version 1.3.38
+2006-01-07: Version 1.3.38
 
 - Fixed handling second audio and Dolby Digital PIDs for encrypted channels
   (was broken in version 1.3.37).
@@ -4121,3 +4121,6 @@ Video Disk Recorder Revision History
 - In string entry fields (like, e.g., the file name of a recording) the characters
   can now be entered by pressing the numeric keys, the same way as on a
   telephone keypad (based on the "Easy Input" patch from Marcel Schaeben).
+- Fixed the "Day" field of the "Edit timer" menu when pressing '0' to switch
+  from "single shot" to "weekly", followed by the "Right" key (reported by
+  Andreas Böttger).
diff --git a/menuitems.c b/menuitems.c
index c19ae6f2..f1342fab 100644
--- a/menuitems.c
+++ b/menuitems.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menuitems.c 1.27 2006/01/06 16:26:05 kls Exp $
+ * $Id: menuitems.c 1.28 2006/01/07 11:20:55 kls Exp $
  */
 
 #include "menuitems.h"
@@ -705,6 +705,7 @@ eOSState cMenuEditDateItem::ProcessKey(eKeys Key)
               }
            else {
               *weekdays = days[cTimer::GetWDay(*value)];
+              dayindex = FindDayIndex(*weekdays);
               oldvalue = *value;
               *value = 0;
               }