Index: lisp-kernel/pmcl-kernel.c
===================================================================
--- lisp-kernel/pmcl-kernel.c   (revision 14112)
+++ lisp-kernel/pmcl-kernel.c   (working copy)
@@ -1798,15 +1798,19 @@
 
   program_name = argv[0];
   if ((argc == 2) && (*argv[1] != '-')) {
+    if (check_for_embedded_image(real_executable_name)) {
+      image_name = real_executable_name;
+    } else {
 #ifdef WINDOWS
-    image_name = utf_16_argv[1];
+      image_name = utf_16_argv[1];
 #else
-    image_name = argv[1];
+      image_name = argv[1];
 #endif
-    argv[1] = NULL;
+      argv[1] = NULL;
 #ifdef WINDOWS
-    utf_16_argv[1] = NULL;
+      utf_16_argv[1] = NULL;
 #endif
+    }
   } else {
     process_options(argc,argv,utf_16_argv);
   }