diff --git a/mozilla/mail/app/Makefile.in b/mozilla/mail/app/Makefile.in
index a3d9c9fdfb6..1cb21c0d60b 100644
--- a/mozilla/mail/app/Makefile.in
+++ b/mozilla/mail/app/Makefile.in
@@ -312,8 +312,7 @@ endif
 ifneq (,$(filter-out OS2 WINNT Darwin,$(OS_ARCH)))
 thunderbird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
-		-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 43a6b029f35..54c73442444 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.8 2008-01-07 23:17:04 reed%reedloden.com Exp $
+## $Id: mozilla.in,v 1.9 2008-05-16 08:22:43 bugzilla%standard8.plus.com Exp $
 ## 
 ## Usage:
 ##
@@ -53,7 +53,6 @@
 #set -x
 
 moz_libdir=%MOZAPPDIR%
-MRE_HOME=%MREDIR%
 
 # Use run-mozilla.sh in the current dir if it exists
 # If not, then start resolving symlinks until we find run-mozilla.sh
@@ -80,6 +79,7 @@ else
     if [ -x "$run_moz" ]; then
       cd "$curdir"
       dist_bin=`pwd`
+      run_moz="$dist_bin/run-mozilla.sh"
       found=1
       break
     fi
@@ -90,8 +90,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
@@ -131,8 +131,6 @@ do
   esac
 done
 
-export MRE_HOME
-
 if [ $debugging = 1 ]
 then
   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"