diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 2d24fb6129cd..fb191c49bb69 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -76,6 +76,8 @@ else
 LIBXUL_DIST = $(DIST)
 endif
 
+XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
+
 MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
diff --git a/configure.in b/configure.in
index 0e44f0ceff35..456b763821ea 100644
--- a/configure.in
+++ b/configure.in
@@ -4366,6 +4366,21 @@ AC_SUBST(MOZ_EMBEDDING_LEVEL_DEFAULT)
 AC_SUBST(MOZ_EMBEDDING_LEVEL_BASIC)
 AC_SUBST(MOZ_EMBEDDING_LEVEL_MINIMAL)
 
+MOZ_ARG_WITH_STRING(xulrunner-stub-name,
+[  --with-xulrunner-stub-name=appname   Create the xulrunner stub with the given name],
+  XULRUNNER_STUB_NAME=$withval)
+
+if test -z "$XULRUNNER_STUB_NAME"; then
+  case "$target_os" in
+  darwin*)
+    XULRUNNER_STUB_NAME=xulrunner
+    ;;
+  *)
+    XULRUNNER_STUB_NAME=xulrunner-stub
+  esac
+fi
+AC_SUBST(XULRUNNER_STUB_NAME)
+
 if test -z "$MOZ_BUILD_APP"; then
   AC_MSG_ERROR([--enable-application=APP was not specified and is required.])
 else
diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in
index 7cd506ff0751..2e237c8ee0ae 100644
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -51,15 +51,11 @@ CPPSRCS   = nsXULStub.cpp
 # Statically link the CRT when possible
 USE_STATIC_LIBS = 1
 
-ifeq ($(OS_ARCH),Darwin)
-
-PROGRAM   = xulrunner$(BIN_SUFFIX)
-
-else
-
-PROGRAM   = xulrunner-stub$(BIN_SUFFIX)
-
-endif # OS_ARCH
+# The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
+# apps to override it using the --with-xulrunner-stub-name=<appname> argument.
+# If this configure argument is not present then the default name is 'xulrunner'
+# for Mac OS X and 'xulrunner-stub' for all other platforms.
+PROGRAM   = $(XULRUNNER_STUB_NAME)$(BIN_SUFFIX)
 
 LOCAL_INCLUDES = -I$(topsrcdir)/xpcom/build