[RT 58464] patching to allow file names with spaces