diff --git a/build/run-mozilla.sh b/build/run-mozilla.sh
new file mode 100755
index 00000000000..e69de29bb2d
diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index b07126db7fc..a30b5c7a79a 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -157,7 +157,11 @@ CXXFLAGS += $(TOOLKIT_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
-install:: $(PROGRAM)
+RUN_VIEWER_SCRIPT=mozilla-viewer.sh
+
+install:: $(PROGRAM) $(RUN_VIEWER_SCRIPT)
 	$(INSTALL) $(EXPORT_RESOURCE_SAMPLES) $(DIST)/bin/res/samples
 	$(INSTALL) $(EXPORT_RESOURCE_THROBBER) $(DIST)/bin/res/throbber
 	$(INSTALL) $(srcdir)/resources/viewer.properties $(DIST)/bin/res
+	$(INSTALL) $(RUN_VIEWER_SCRIPT) $(DIST)/bin
+
diff --git a/webshell/tests/viewer/mozilla-viewer.sh b/webshell/tests/viewer/mozilla-viewer.sh
new file mode 100755
index 00000000000..bf4d628d714
--- /dev/null
+++ b/webshell/tests/viewer/mozilla-viewer.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## 
+## Usage:
+##
+## $ mozilla-viewer.sh [viewer args]
+##
+## This script is meant to run the gecko viewer from either 
+## mozilla/webshell/tests/viewer or mozilla/dist/bin.
+##
+## The script will setup all the environment voodoo needed to make
+## the viewer work.
+##
+
+depth=""
+
+# Running from dist/bin
+if [ -d components -a -d res ]
+then
+	depth="../.."
+else
+	# Running from source dir
+	if [ -f Makefile.in ]
+	then
+		depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+	fi
+fi
+
+$depth/build/run-mozilla.sh viewer ${1+"$@"}
diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in
index 0a7f6d25207..20a0a128486 100644
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@@ -95,3 +95,7 @@ CFLAGS += $(TOOLKIT_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
+RUN_APPRUNNER_SCRIPT=mozilla-apprunner.sh
+
+install:: $(RUN_APPRUNNER_SCRIPT)
+	$(INSTALL) $(RUN_APPRUNNER_SCRIPT) $(DIST)/bin
diff --git a/xpfe/bootstrap/mozilla-apprunner.sh b/xpfe/bootstrap/mozilla-apprunner.sh
new file mode 100755
index 00000000000..1c3fcae9d2e
--- /dev/null
+++ b/xpfe/bootstrap/mozilla-apprunner.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+## 
+## Usage:
+##
+## $ mozilla-apprunner.sh [apprunner args]
+##
+## This script is meant to run the gecko apprunner from either 
+## mozilla/xpfe/bootstrap or mozilla/dist/bin.
+##
+## The script will setup all the environment voodoo needed to make
+## the apprunner work.
+##
+
+depth=""
+
+# Running from dist/bin
+if [ -d components -a -d res ]
+then
+	depth="../.."
+else
+	# Running from source dir
+	if [ -f Makefile.in ]
+	then
+		depth=`grep -w DEPTH Makefile.in  | grep -e "\.\." | awk -F"=" '{ print $2; }'`
+	fi
+fi
+
+$depth/build/run-mozilla.sh apprunner ${1+"$@"}