Index: fcb.c
===================================================================
--- fcb.c	(revision 71204)
+++ fcb.c	(working copy)
@@ -7,6 +7,7 @@
 *                   Rex Jolliff (rex@lvcablemodem.com)
 *                   Herve Poussineau (reactos@poussine.freesurf.fr)
 *                   Pierre Schweitzer (pierre@reactos.org)
+*                   Wim Hueskes (reactos@wimhueskes.eu)
 */
 
 /*  -------------------------------------------------------  INCLUDES  */
@@ -392,9 +393,39 @@
     Fcb->DirNameU.Buffer = Fcb->PathNameU.Buffer;
     vfatSplitPathName(&Fcb->PathNameU, &Fcb->DirNameU, &Fcb->LongNameU);
 
-    /* Copy short name */
-    RtlCopyUnicodeString(&Fcb->ShortNameU, ShortName);
+    if (!RtlEqualUnicodeString(&Fcb->ShortNameU, ShortName, FALSE))
+    {
+        int i, j;
+        OEM_STRING NameA;
+        CHAR aName[13];
 
+        /* Copy short name */
+        RtlCopyUnicodeString(&Fcb->ShortNameU, ShortName);
+
+        /* Update name in Fat entry */
+        NameA.Buffer = aName;
+        NameA.Length = 0;
+        NameA.MaximumLength = sizeof(aName);
+
+        RtlIsNameLegalDOS8Dot3(&Fcb->ShortNameU, &NameA, NULL);
+
+        memset(Fcb->entry.Fat.ShortName, ' ', 11);
+        for (i = 0; i < 8 && aName[i] && aName[i] != '.'; i++)
+        {
+            Fcb->entry.Fat.Filename[i] = aName[i];
+        }
+        if (aName[i] == '.')
+        {
+            i++;
+            for (j = 0; j < 3 && aName[i]; j++, i++)
+            {
+                Fcb->entry.Fat.Ext[j] = aName[i];
+            }
+        }
+        DPRINT("vfatUpdateFCB, ShortName \'%wZ\'\n", &Fcb->ShortNameU);
+        DPRINT("vfatUpdateFCB dos name=%11.11s\n", Fcb->entry.Fat.Filename);
+    }
+
     /* Recompute hashes */
     Fcb->Hash.Hash = vfatNameHash(0, &Fcb->PathNameU);
     if (pVCB->Flags & VCB_IS_FATX)
