diff --git a/build/unix/run-mozilla.sh b/build/unix/run-mozilla.sh
index 05abc49cfbf..d4fa27cfedc 100755
--- a/build/unix/run-mozilla.sh
+++ b/build/unix/run-mozilla.sh
@@ -382,24 +382,27 @@ then
         export XSUNTRANSPORT XSUNSMESIZE
 fi
 
-echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
-echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
-if [ -n "$LD_LIBRARYN32_PATH" ]
+if [ "$moz_debug" ]
 then
-	echo "LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH"
+  echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
+  echo "  LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+  if [ -n "$LD_LIBRARYN32_PATH" ]
+  then
+  	echo "LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH"
+  fi
+  if [ -n "$LD_LIBRARYN64_PATH" ]
+  then
+  	echo "LD_LIBRARYN64_PATH=$LD_LIBRARYN64_PATH"
+  fi
+  echo "     LIBRARY_PATH=$LIBRARY_PATH"
+  echo "       SHLIB_PATH=$SHLIB_PATH"
+  echo "          LIBPATH=$LIBPATH"
+  echo "       ADDON_PATH=$ADDON_PATH"
+  echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
+  echo "      MOZ_TOOLKIT=$MOZ_TOOLKIT"
+  echo "        moz_debug=$moz_debug"
+  echo "     moz_debugger=$moz_debugger"
 fi
-if [ -n "$LD_LIBRARYN64_PATH" ]
-then
-	echo "LD_LIBRARYN64_PATH=$LD_LIBRARYN64_PATH"
-fi
-echo "     LIBRARY_PATH=$LIBRARY_PATH"
-echo "       SHLIB_PATH=$SHLIB_PATH"
-echo "          LIBPATH=$LIBPATH"
-echo "       ADDON_PATH=$ADDON_PATH"
-echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
-echo "      MOZ_TOOLKIT=$MOZ_TOOLKIT"
-echo "        moz_debug=$moz_debug"
-echo "     moz_debugger=$moz_debugger"
 #
 export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
 export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH
diff --git a/xpfe/bootstrap/mozilla b/xpfe/bootstrap/mozilla
index 0a168f5e5f0..992acf482ba 100755
--- a/xpfe/bootstrap/mozilla
+++ b/xpfe/bootstrap/mozilla
@@ -16,7 +16,7 @@
 # Reserved.
 #
 
-## $Id: mozilla,v 1.10 2001-01-23 15:34:56 cls%seawood.org Exp $
+## $Id: mozilla,v 1.11 2001-11-03 05:05:47 seawood%netscape.com Exp $
 ## 
 ## Usage:
 ##
@@ -66,5 +66,8 @@ do
 done
 
 eval "set -- $moreargs"
-echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+if [ $debugging = 1 ]
+then
+  echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+fi
 exec $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"