diff --git a/HISTORY b/HISTORY
index a38f4f22..3934eb8f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4688,7 +4688,7 @@ Video Disk Recorder Revision History
 - Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 
-2006-05-12: Version 1.4.0-1
+2006-05-14: Version 1.4.0-1
 
 - Updated 'S110W' in 'sources.conf'.
 - Adjusted the 'runvdr' script so that the user can fill in the functions to
@@ -4713,3 +4713,5 @@ Video Disk Recorder Revision History
 - Since some channels (especially the Austrian ORF) randomly change the ids of their
   EPG events, VDR now gives the start time precedence when searching for existing
   events.
+- Fixed automatically updating the CAM menu in case the whole operation (for
+  instance a firmware update) takes longer than the menu timeout.
diff --git a/vdr.c b/vdr.c
index 6f4a9725..6343933f 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.271 2006/05/13 09:10:56 kls Exp $
+ * $Id: vdr.c 1.272 2006/05/14 09:23:46 kls Exp $
  */
 
 #include <getopt.h>
@@ -1032,6 +1032,9 @@ int main(int argc, char *argv[])
               else if (time(NULL) - LastActivity > MENUTIMEOUT)
                  state = osEnd;
               }
+           // TODO make the CAM menu stay open in case of automatic updates and have it return osContinue; then the following two lines can be removed again
+           else if (state == osEnd && LastActivity > 1)
+              LastActivity = time(NULL);
            switch (state) {
              case osPause:  DELETE_MENU;
                             cControl::Shutdown(); // just in case