diff --git a/mozilla/configure.in b/mozilla/configure.in
index aa34d4e0fbf..e872117ec49 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -1815,6 +1815,12 @@ AC_SUBST(XCFLAGS)
 AC_SUBST(XLDFLAGS)
 AC_SUBST(XLIBS)
 
+if test "$MOZ_ENABLE_GTK" || test "$MOZ_ENABLE_QT" \
+|| test "$MOZ_ENABLE_XLIB" || test "$MOZ_ENABLE_MOTIF"
+then
+AC_DEFINE(MOZ_X11)
+fi
+
 dnl Check for GLib and libIDL.
 dnl ========================================================
 SKIP_IDL_CHECK="no"
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index f91ccc26c09..82e94af46b7 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -1023,7 +1023,7 @@ static void DumpHelp(char *appname)
   printf("       where options include:\n");
   printf("\n");
 
-#ifdef XP_UNIX
+#ifdef MOZ_WIDGET_GTK
   /* insert gtk options above moz options, like any other gtk app
    *
    * note: this isn't a very cool way to do things -- i'd rather get
@@ -1034,18 +1034,24 @@ static void DumpHelp(char *appname)
   printf("GTK options\n");
   printf("%s--gdk-debug=FLAGS%sGdk debugging flags to set\n", HELP_SPACER_1, HELP_SPACER_2);
   printf("%s--gdk-no-debug=FLAGS%sGdk debugging flags to unset\n", HELP_SPACER_1, HELP_SPACER_2);
+  printf("%s--gtk-debug=FLAGS%sGtk+ debugging flags to set\n", HELP_SPACER_1, HELP_SPACER_2);
+  printf("%s--gtk-no-debug=FLAGS%sGtk+ debugging flags to unset\n", HELP_SPACER_1, HELP_SPACER_2);
+  printf("%s--gtk-module=MODULE%sLoad an additional Gtk module\n", HELP_SPACER_1, HELP_SPACER_2);
+
+  /* end gtk options */
+#endif
+#ifdef MOZ_X11
+  printf("X11 options\n");
   printf("%s--display=DISPLAY%sX display to use\n", HELP_SPACER_1, HELP_SPACER_2);
   printf("%s--sync%sMake X calls synchronous\n", HELP_SPACER_1, HELP_SPACER_2);
   printf("%s--no-xshm%sDon't use X shared memory extension\n", HELP_SPACER_1, HELP_SPACER_2);
   printf("%s--xim-preedit=STYLE\n", HELP_SPACER_1);
   printf("%s--xim-status=STYLE\n", HELP_SPACER_1);
-  printf("%s--gtk-debug=FLAGS%sGtk+ debugging flags to set\n", HELP_SPACER_1, HELP_SPACER_2);
-  printf("%s--gtk-no-debug=FLAGS%sGtk+ debugging flags to unset\n", HELP_SPACER_1, HELP_SPACER_2);
+#endif
+#ifdef XP_UNIX
   printf("%s--g-fatal-warnings%sMake all warnings fatal\n", HELP_SPACER_1, HELP_SPACER_2);
-  printf("%s--gtk-module=MODULE%sLoad an additional Gtk module\n", HELP_SPACER_1, HELP_SPACER_2);
+
   printf("\nMozilla options\n");
-  
-  /* end gtk options */
 #endif
 
   printf("%s-height <value>%sSet height of startup window to <value>.\n",HELP_SPACER_1,HELP_SPACER_2);