Index: /trunk/source/lisp-kernel/pmcl-kernel.c
===================================================================
--- /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15186)
+++ /trunk/source/lisp-kernel/pmcl-kernel.c	(revision 15187)
@@ -98,4 +98,5 @@
 #include <mach-o/dyld.h>
 #include <dlfcn.h>
+#include <libgen.h>
 #endif
 
@@ -960,5 +961,16 @@
 #endif
 
-
+#ifdef DARWIN
+char *
+bundle_image_name(char *orig)
+{
+  char *base = basename(orig);
+  char *dir = dirname(orig);
+  char path[MAXPATHLEN];
+
+  snprintf(path, MAXPATHLEN, "%s/../Resources/ccl/%s", dir, base);
+  return path_by_appending_image(path);
+}
+#endif
 
 char *program_name = NULL;
@@ -1924,4 +1936,9 @@
     } else {
       image_name = default_image_name(real_executable_name);
+#ifdef DARWIN
+      if (!probe_file(image_name)) {
+	image_name = bundle_image_name(real_executable_name);
+      }
+#endif
     }
   }