--- a/cinst/nssstore_win.c	Wed Apr 16 10:00:17 2014 +0200
+++ b/cinst/nssstore_win.c	Wed Apr 16 10:01:02 2014 +0200
@@ -98,7 +98,6 @@
   for (i = 0; certificates[i]; i++)
     {
       int ret = 0;
-      DEBUGPRINTF("Writing \n");
       if (remove)
         ret = fprintf (write_stream, "R:%s\n", certificates[i]);
       else
@@ -111,7 +110,6 @@
         }
     }
 
-  DEBUGPRINTF("Write done\n");
   return true;
 }
 
@@ -155,12 +153,15 @@
      restrict token -> hChildToken
   */
 
-  cmd_line_len = wcslen (lpApplicationName) + wcslen(selection_file) + 1;
+  cmd_line_len = wcslen (lpApplicationName) + wcslen(selection_file) + 2;
   lpCommandLine = xmalloc (cmd_line_len * sizeof(wchar_t));
 
   wcscpy_s (lpCommandLine, cmd_line_len, lpApplicationName);
+  wcscpy_s (lpCommandLine, cmd_line_len, L" ");
   wcscat_s (lpCommandLine, cmd_line_len, selection_file);
 
+  DEBUGPRINTF ("Starting %S with command line %S\n", lpApplicationName, lpCommandLine);
+
   success = CreateProcessAsUserW (hToken,
                                   lpApplicationName,
                                   lpCommandLine, /* Commandline */