Index: /trunk/src/kmk/dir-nt-bird.c
===================================================================
--- /trunk/src/kmk/dir-nt-bird.c	(revision 3023)
+++ /trunk/src/kmk/dir-nt-bird.c	(revision 3024)
@@ -251,6 +251,9 @@
         if (pEntry->bObjType != KFSOBJ_TYPE_MISSING)
         {
-            /* Copy the name that fits.  If neither fits, skip the name. */
-            if (pEntry->cchName < sizeof(pDir->DirEnt.d_name))
+            /* Copy the name that fits, trying to avoid names with spaces.
+               If neither fits, skip the name. */
+            if (   pEntry->cchName < sizeof(pDir->DirEnt.d_name)
+                && (   pEntry->pszShortName == pEntry->pszName
+                    || memchr(pEntry->pszName, ' ', pEntry->cchName) == NULL))
             {
                 pDir->DirEnt.d_namlen = pEntry->cchName;