Index: /trunk/ccl/level-1/l1-pathnames.lisp
===================================================================
--- /trunk/ccl/level-1/l1-pathnames.lisp	(revision 5580)
+++ /trunk/ccl/level-1/l1-pathnames.lisp	(revision 5581)
@@ -618,12 +618,12 @@
     (if dirpath
       (native-to-directory-pathname dirpath)
-      (let* ((rpath (merge-pathnames
+      (let* ((directory-containing-heap-image
+              (make-pathname :directory (pathname-directory *heap-image-name*)))
+             (rpath (merge-pathnames
 		     #+darwinppc-target "../Resources/ccl/"
 		     #+linux-target "Resources/ccl/"
-		     (make-pathname
-		      :directory
-		      (pathname-directory (car *command-line-argument-list*))))))
+                     directory-containing-heap-image)))
 	(or (probe-file rpath)
-	    (mac-default-directory))))))
+            directory-containing-heap-image)))))