--- mozilla/browser/app/Makefile.in~	2006-08-29 04:03:07.000000000 +0200
+++ mozilla/browser/app/Makefile.in	2006-11-15 10:43:19.000000000 +0100
@@ -62,9 +62,9 @@
 DEFINES += -DAB_CD=$(AB_CD)
 
 ifeq ($(USE_SHORT_LIBNAME), 1)
-PROGRAM = firefox$(BIN_SUFFIX)
+PROGRAM = mozilla-firefox$(BIN_SUFFIX)
 else
-PROGRAM = firefox-bin$(BIN_SUFFIX)
+PROGRAM = mozilla-firefox-bin$(BIN_SUFFIX)
 endif
 
 REQUIRES = \
--- mozilla/browser/app/mozilla.in~	2006-11-15 10:36:11.000000000 +0100
+++ mozilla/browser/app/mozilla.in	2006-11-15 10:46:19.000000000 +0100
@@ -98,7 +98,11 @@
 # Use run-mozilla.sh in the current dir if it exists
 # If not, then start resolving symlinks until we find run-mozilla.sh
 found=0
-progname="$0"
+if [ `basename $0` == "mozffremote" ]; then
+  progname="mozilla-firefox"
+else
+  progname="$0"
+fi
 curdir=`dirname "$progname"`
 progbase=`basename "$progname"`
 run_moz="$curdir/run-mozilla.sh"
@@ -130,6 +134,7 @@
   # Check default compile-time libdir
   if [ -x "$moz_libdir/run-mozilla.sh" ]; then
     dist_bin="$moz_libdir"
+    run_moz="$moz_libdir/run-mozilla.sh"
   else 
     echo "Cannot find mozilla runtime directory. Exiting."
     exit 1