--- patch-2.5.4/util.c	1999-08-30 07:20:08.000000000 +0100
+++ patch-2.5.9/util.c	2003-05-20 15:04:53.000000000 +0100
@@ -939,7 +939,13 @@ fetchname (char *at, int strip_leading, 
 	  }
 	else if (ISSPACE ((unsigned char) *t))
 	  {
+	    /* Allow file names with internal spaces,
+	       but only if a tab separates the file name from the date.  */
 	    char const *u = t;
+	    while (*u != '\t' && ISSPACE ((unsigned char) u[1]))
+	      u++;
+	    if (*u != '\t' && strchr (u + 1, '\t'))
+	      continue;
 
 	    if (set_time | set_utc)
 	      stamp = str2time (&u, initial_time,