diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 1471ecc6..c48eafff 100644
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -126,10 +126,17 @@ cleanupfilename(char *s, int dvr_flags)
 {
   int i, len = strlen(s);
   for(i = 0; i < len; i++) { 
-    if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && (s[i] == ' ' || s[i] == '\t'))
+
+    if(s[i] == '/')
+      s[i] = '-';
+
+    else if((dvr_flags & DVR_WHITESPACE_IN_TITLE) &&
+            (s[i] == ' ' || s[i] == '\t'))
       s[i] = '-';	
 
-    if((s[i] < 32) || (s[i] > 122) || (strchr("/:\\<>|*?'\"", s[i]) != NULL))
+    else if((dvr_flags & DVR_CLEAN_TITLE) &&
+            ((s[i] < 32) || (s[i] > 122) ||
+             (strchr("/:\\<>|*?'\"", s[i]) != NULL)))
       s[i] = '-';
   }
 }