diff --git a/HISTORY b/HISTORY
index 60663ed2..c20d1318 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3544,3 +3544,4 @@ Video Disk Recorder Revision History
 - The audio track menu now contains track descriptions when replaying (provided
   such descriptions were available in the EPG data when the recording was made,
   and are stored in the info.vdr file).
+- Avoiding extra blanks at the end of names of instant recordings.
diff --git a/recording.c b/recording.c
index d20e9cbf..199d6827 100644
--- a/recording.c
+++ b/recording.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: recording.c 1.99 2005/05/16 14:19:38 kls Exp $
+ * $Id: recording.c 1.100 2005/05/16 15:17:22 kls Exp $
  */
 
 #include "recording.h"
@@ -386,6 +386,14 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
      name = strdup(Timer->File());
      name = strreplace(name, TIMERMACRO_TITLE, Title);
      name = strreplace(name, TIMERMACRO_EPISODE, Subtitle);
+     // avoid blanks at the end:
+     int l = strlen(name);
+     while (l-- > 2) {
+           if (name[l] == ' ' && name[l - 1] != '~')
+              name[l] = 0;
+           else
+              break;
+           }
      if (Timer->IsSingleEvent()) {
         Timer->SetFile(name); // this was an instant recording, so let's set the actual data
         Timers.SetModified();