Index: dll/win32/setupapi/install.c
===================================================================
--- dll/win32/setupapi/install.c	(revision 71918)
+++ dll/win32/setupapi/install.c	(working copy)
@@ -1108,8 +1108,13 @@
                             if (FullLinkName[wcslen(FullLinkName) - 1] != '\\')
                                 wcscat(FullLinkName, BackSlash);
                         }
-                        wcscat(FullLinkName, LinkName);
-                        wcscat(FullLinkName, DotLnk);
+
+                        /* Concatenate the LinkName.lnk if we have one */
+                        if (LinkName)
+                        {
+                            wcscat(FullLinkName, LinkName);
+                            wcscat(FullLinkName, DotLnk);
+                        }
                         hr = IPersistFile_Save(ppf, FullLinkName, TRUE);
                     }
                     else