diff --git a/HISTORY b/HISTORY
index 10e4ae6c..bb243b71 100644
--- a/HISTORY
+++ b/HISTORY
@@ -335,3 +335,5 @@ Video Disk Recorder Revision History
 - Fixed starting a replay session when the program is currently in "transfer
   mode".
 - Fixed setting/modifying timers via SVDRP with empty summary fields.
+- Fixed a problem with recordings that have a single quote character in their
+  name (this is now mapped to 0x01).
diff --git a/recording.c b/recording.c
index e649be42..064731df 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.23 2001/01/01 14:48:03 kls Exp $
+ * $Id: recording.c 1.24 2001/01/13 12:17:15 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -126,6 +126,7 @@ cRecording::cRecording(const char *FileName)
         strncpy(name, FileName, p - FileName);
         name[p - FileName] = 0;
         strreplace(name, '_', ' ');
+        strreplace(name, '\x01', '\'');
         }
      // read an optional summary file:
      char *SummaryFileName = NULL;
@@ -176,8 +177,10 @@ const char *cRecording::FileName(void)
   if (!fileName) {
      struct tm *t = localtime(&start);
      asprintf(&fileName, NAMEFORMAT, VideoDirectory, name, t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, priority, lifetime);
-     if (fileName)
+     if (fileName) {
         strreplace(fileName, ' ', '_');
+        strreplace(fileName, '\'', '\x01');
+        }
      }
   return fileName;
 }
diff --git a/tools.c b/tools.c
index f29dc004..1caaa9fd 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.25 2000/12/24 12:38:22 kls Exp $
+ * $Id: tools.c 1.26 2001/01/13 12:17:30 kls Exp $
  */
 
 #define _GNU_SOURCE
@@ -120,7 +120,7 @@ const char *AddDirectory(const char *DirName, const char *FileName)
   return buf;
 }
 
-#define DFCMD  "df -m %s"
+#define DFCMD  "df -m '%s'"
 
 uint FreeDiskSpaceMB(const char *Directory)
 {