Index: main.c
===================================================================
--- main.c	(revision 29678)
+++ main.c	(working copy)
@@ -139,8 +139,35 @@
   else if (G_LIKELY (opt_launch != NULL))
     {
       /* combine all specified parameters to one parameter string */
-      parameter = (argc > 1) ? g_strjoinv (" ", argv + 1) : NULL;
+      if (argc > 1)
+        {
+          gint len = 0;
+          gint i;
+          gchar *tail;
 
+          /* determine the length of the final string */
+          for (i=1; i<argc; ++i) {
+            /* + 2 (for the quotes) + 1 (for the separating space / terminating \0) */
+            len += strlen (argv[i]) + 3;
+          }
+
+          /* copy parameters, adding quotes and spaces */
+          tail = parameter = g_malloc (len);
+          *tail++ = '\'';
+          tail = g_stpcpy (tail, argv[1]);
+          for (i=2; i<argc; ++i)
+            {
+              tail = g_stpcpy (tail, "' '");
+              tail = g_stpcpy (tail, argv[i]);
+            }
+          *tail++ = '\'';
+          *tail = '\0';
+        }
+      else
+        {
+          parameter = NULL;
+        }
+
       /* run the preferred application */
       if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err))
         {