diff --git a/Source/d_deh.c b/Source/d_deh.c
index 910a177e..27f38b93 100644
--- a/Source/d_deh.c
+++ b/Source/d_deh.c
@@ -1627,7 +1627,7 @@ void ProcessDehFile(const char *filename, char *outfilename, int lumpnum)
           printf("-deh file %s not found\n",filename);
           return;  // should be checked up front anyway
         }
-      tmp = M_StringJoin("\"", M_BaseName(filename), "\" ", NULL);
+      tmp = M_StringJoin(" \"", M_BaseName(filename), "\"", NULL);
       M_StringAdd(&dehfiles, tmp);
       (free)(tmp);
       infile.lump = NULL;
diff --git a/Source/g_game.c b/Source/g_game.c
index 9f29fbfa..5a0714f6 100644
--- a/Source/g_game.c
+++ b/Source/g_game.c
@@ -3306,40 +3306,36 @@ static void G_AddDemoFooter(void)
   int i;
 
   str = M_StringJoin(PROJECT_STRING, DEMO_FOOTER_SEPARATOR,
-                     "-iwad \"", M_BaseName(wadfiles[0]), "\" ", NULL);
+                     "-iwad \"", M_BaseName(wadfiles[0]), "\"", NULL);
   for (i = 1; wadfiles[i]; i++)
   {
     if (i == 1)
-      M_StringAdd(&str, "-file ");
+      M_StringAdd(&str, " -file");
 
-    tmp = M_StringJoin("\"", M_BaseName(wadfiles[i]), "\" ", NULL);
+    tmp = M_StringJoin(" \"", M_BaseName(wadfiles[i]), "\"", NULL);
     M_StringAdd(&str, tmp);
     (free)(tmp);
   }
 
   if (dehfiles)
   {
-    M_StringAdd(&str, "-deh ");
+    M_StringAdd(&str, " -deh");
     M_StringAdd(&str, dehfiles);
   }
 
   if (demo_compatibility)
   {
-    M_StringAdd(&str, "-complevel vanilla ");
-    tmp = M_StringJoin("-gameversion ", GetGameVersionCmdline(), " ", NULL);
+    M_StringAdd(&str, " -complevel vanilla");
+    tmp = M_StringJoin(" -gameversion ", GetGameVersionCmdline(), NULL);
     M_StringAdd(&str, tmp);
     (free)(tmp);
   }
 
   if (coop_spawns)
   {
-    M_StringAdd(&str, "-coop_spawns");
+    M_StringAdd(&str, " -coop_spawns");
   }
 
-  tmp = str + strlen(str) - 1;
-  while (*tmp == ' ')
-      *tmp-- = '\0';
-
   M_StringAdd(&str, DEMO_FOOTER_SEPARATOR);
 
   len = strlen(str);