Here's another version of the patch for version 2.1.3 which solves bug 435682 (https://bugzilla.redhat.com/show_bug.cgi?id=435682).
Seems to be slightly better than previous version, 'cause now it's using something like escape sequence to handle filenames with spaces.