diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index e195dfbc55c..d4a0c2b9ccc 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -267,7 +267,7 @@ thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
                 -e "s|%MOZ_USER_DIR%|.thunderbird|" \
 		-e "s|%MREDIR%|$(mredir)|" \
-		-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
+ 		-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
 	chmod +x $@
 
 libs:: thunderbird
diff --git a/mozilla/mail/app/mozilla.in b/mozilla/mail/app/mozilla.in
index 9792b70f2fa..b9742a1a4d2 100644
--- a/mozilla/mail/app/mozilla.in
+++ b/mozilla/mail/app/mozilla.in
@@ -36,7 +36,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-## $Id: mozilla.in,v 1.5.4.2 2008-01-11 03:20:02 reed%reedloden.com Exp $
+## $Id: mozilla.in,v 1.5.4.3 2008-10-22 21:04:53 bugzilla%standard8.plus.com Exp $
 ## 
 ## Usage:
 ##
@@ -120,6 +120,7 @@ else
     if [ -x "$run_moz" ]; then
       cd "$curdir"
       dist_bin=`pwd`
+      run_moz="$dist_bin/run-mozilla.sh"
       found=1
       break
     fi
@@ -130,8 +131,8 @@ if [ $found = 0 ]; then
   # Check default compile-time libdir
   if [ -x "$moz_libdir/run-mozilla.sh" ]; then
     dist_bin="$moz_libdir"
-  else 
-    echo "Cannot find mozilla runtime directory. Exiting."
+  else
+    echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting."
     exit 1
   fi
 fi