diff --git a/HISTORY b/HISTORY
index d9d8ed76..f283c140 100644
--- a/HISTORY
+++ b/HISTORY
@@ -671,3 +671,5 @@ Video Disk Recorder Revision History
   maximum size of the recorded video files.
 - Fixed a bug in handling repeating timers that record over midnight (the
   calculation of matching timers has been completely rewritten).
+- Timers that are currently recording are now marked with '#' in the "Timers"
+  menu.
diff --git a/MANUAL b/MANUAL
index 5087367f..90a10ded 100644
--- a/MANUAL
+++ b/MANUAL
@@ -34,7 +34,8 @@ Video Disk Recorder User's Manual
   any changes that might have been made in the current menu.
 
   In the "Timers" menu, the current timer can be enabled or disabled with
-  the "Right" or "Left" key, respectively (enabled timers are marked with ">").
+  the "Right" or "Left" key, respectively (enabled timers are marked with '>',
+  timers that are currently recording are marked with '#').
   "Ok" here opens the "Edit timer" menu.
 
   Textual options, like channel names or recording file names, can be edited
diff --git a/menu.c b/menu.c
index 14831824..4158f75f 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.107 2001/08/25 13:37:27 kls Exp $
+ * $Id: menu.c 1.108 2001/08/26 12:13:24 kls Exp $
  */
 
 #include "menu.h"
@@ -975,7 +975,7 @@ void cMenuTimerItem::Set(void)
 {
   char *buffer = NULL;
   asprintf(&buffer, "%c\t%d\t%s\t%02d:%02d\t%02d:%02d\t%s",
-                    timer->active ? '>' : ' ',
+                    timer->active ? timer->recording ? '#' : '>' : ' ',
                     timer->channel,
                     timer->PrintDay(timer->day),
                     timer->start / 100,