diff --git a/HISTORY b/HISTORY
index a54c3dcd..d02a1cc7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -190,3 +190,6 @@ Video Disk Recorder Revision History
 - The new SVDRP commands 'OVL*' can be used to control video overlays (thanks
   to Guido Fiala!). This is mainly for use in the 'kvdr' tool (see the 'kvdr'
   page at http://www.s.netic.de/gfiala).
+- If the name of the video directory used with the '-v' option had trailing
+  slashes, the recording file names have been damaged. Trailing slashes are
+  now silently removed.
diff --git a/INSTALL b/INSTALL
index 7e102d4e..9f11e3dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -64,7 +64,9 @@ All recordings are written into directories below "/video". Please
 make sure this directory exists, and that the user who runs the 'vdr'
 program has read and write access to that directory.
 If you prefer a different location for your video files, you can use
-the '-v' option to change that.
+the '-v' option to change that. Please make sure that the directory
+name you use with '-v' is a clean and absolute path name (no '..' or
+multiple slashes).
 
 Note that the file system need not be 64-bit proof, since the 'vdr'
 program splits video files into chunks of about 1GB. You should use
diff --git a/vdr.c b/vdr.c
index 943ff766..2ab32c17 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/people/kls/vdr
  *
- * $Id: vdr.c 1.32 2000/09/15 15:01:08 kls Exp $
+ * $Id: vdr.c 1.33 2000/09/17 14:15:24 kls Exp $
  */
 
 #include <getopt.h>
@@ -116,6 +116,8 @@ int main(int argc, char *argv[])
                        }
                     break;
           case 'v': VideoDirectory = optarg;
+                    while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
+                          optarg[strlen(optarg) - 1] = 0;
                     break;
           default:  abort();
           }