diff --git a/ChangeLog b/ChangeLog
index 5b857fad22..d5c6f93c14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-06  Sven Neumann  <sven@gimp.org>
+
+	* app/main.c: improved "--help" output.
+
+	* docs/gimp.1.in: updated.
+
 2005-04-05  Sven Neumann  <sven@gimp.org>
 
 	* INSTALL
diff --git a/app/main.c b/app/main.c
index 5f443775de..90e89d6d88 100644
--- a/app/main.c
+++ b/app/main.c
@@ -133,7 +133,7 @@ static const GOptionEntry main_entries[] =
   {
     "no-data", 'd', 0,
     G_OPTION_ARG_NONE, &no_data,
-    N_("Do not load brushes, gradients, palettes, patterns"), NULL
+    N_("Do not load brushes, gradients, patterns, ..."), NULL
   },
   {
     "no-fonts", 'f', 0,
@@ -178,7 +178,7 @@ static const GOptionEntry main_entries[] =
   {
     "batch-interpreter", 0, 0,
     G_OPTION_ARG_STRING, &batch_interpreter,
-    N_("The procedure to process batch commands with"), "<procedure>"
+    N_("The procedure to process batch commands with"), "<proc>"
   },
   {
     "console-messages", 0, 0,
@@ -188,12 +188,14 @@ static const GOptionEntry main_entries[] =
   {
     "pdb-compat-mode", 0, 0,
     G_OPTION_ARG_CALLBACK, gimp_option_pdb_compat_mode,
-    N_("PDB compatibility mode"), "<never|query|always>"
+    /*  don't translate the mode names (off|on|warn)  */
+    N_("PDB compatibility mode (off|on|warn)"), "<mode>"
   },
   {
     "stack-trace-mode", 0, 0,
     G_OPTION_ARG_CALLBACK, gimp_option_stack_trace_mode,
-    N_("Debugging mode for fatal signals"), NULL
+    /*  don't translate the mode names (never|query|always)  */
+    N_("Debug in case of a crash (never|query|always)"), "<mode>"
   },
   {
     "debug-handlers", 0, 0,
diff --git a/docs/gimp.1.in b/docs/gimp.1.in
index 6b066ef628..833852c1c8 100644
--- a/docs/gimp.1.in
+++ b/docs/gimp.1.in
@@ -1,4 +1,4 @@
-.TH GIMP 1 "March 23 2004" "Version @GIMP_VERSION@" "GIMP Manual Pages"
+.TH GIMP 1 "April 6 2005" "Version @GIMP_VERSION@" "GIMP Manual Pages"
 
 .SH NAME
 gimp - an image manipulation and paint program.
@@ -6,13 +6,14 @@ gimp - an image manipulation and paint program.
 
 .SH SYNOPSIS
 .B gimp
-[\-h] [\-\-help] [-v] [\-\-version] [\-\-verbose] [\-\-no\-shm]
-[\-\-no\-cpu\-accel] [\-\-display \fIdisplay\fP] [\-d] [\-\-no\-data]
-[\-f] [\-\-no\-fonts] [\-i] [\-\-no\-interface] [\-s] [\-\-no\-splash]
-[\-\-session \fI<name>\fP] [\-g] [\-\-gimprc \fI<gimprc>\fP]
-[\-\-system\-gimprc \fI<gimprc>\fP] [\-\-dump\-gimprc\fP]
-[\-\-console\-messages] [\-\-debug\-handlers]
-[\-\-batch\-interpreter \fI<procedure>\fP] [\-b] [\-\-batch \fI<commands>\fP]
+[\-h] [\-\-help] [\-\-help-all] [\-\-help-gtk] [-v] [\-\-version]
+[\-\-verbose] [\-\-no\-shm] [\-\-no\-cpu\-accel] [\-\-display \fIdisplay\fP]
+[\-d] [\-\-no\-data] [\-f] [\-\-no\-fonts] [\-i] [\-\-no\-interface]
+[\-s] [\-\-no\-splash] [\-\-session \fI<name>\fP]
+[\-g] [\-\-gimprc \fI<gimprc>\fP] [\-\-system\-gimprc \fI<gimprc>\fP]
+[\-\-dump\-gimprc\fP] [\-\-console\-messages] [\-\-debug\-handlers]
+[\-\-stack\-trace\-mode \fI<mode>\fP] [\-\-pdb\-compat\-mode \fI<mode>\fP]
+[\-\-batch\-interpreter \fI<procedure>\fP] [\-b] [\-\-batch \fI<command>\fP]
 [\fIfilename\fP] ...
 
 
@@ -42,7 +43,13 @@ advanced non-interactive processing and creation of images.
 The \fIgimp\fP accepts the following options:
 .TP 8
 .B  \-h, \-\-help
-Display a list of all commandline options.
+Show GIMP commandline options.
+.TP 8
+.B  \-\-help\-all
+Show all commandline options.
+.TP 8
+.B  \-\-help-gtk
+Show GTK+ commandline options.
 .TP 8
 .B \-v, \-\-version
 Output the version info.
@@ -107,12 +114,11 @@ If the PDB should provide aliases for deprecated functions.
 Speficies the procedure to use to process batch events. The default is
 to let Script-Fu evaluate the commands.
 .TP 8
-.B \-b, \-\-batch \fI<commands>\fP
-Execute the set of \fI<commands>\fP non-interactively. The set
-of \fI<commands>\fP is typically in the form of a script that
-can be executed by one of the GIMP scripting extensions. When
-\fI<commands>\fP is \fB-\fP the commands are read from standard
-input.
+.B \-b, \-\-batch \fI<command>\fP
+Execute \fI<command>\fP non-interactively. This option may appear
+multiple times.  The \fI<command>\fP is passed to the batch
+interpreter. When \fI<command>\fP is \fB-\fP the commands are read
+from standard input.
 .TP 8