diff --git a/ChangeLog b/ChangeLog
index 8d61edd258..4e9a6a2b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-21  Sven Neumann  <sven@gimp.org>
+
+	* tools/gimp-remote.c: added --no-splash command-line option that
+	is passed to gimp. Addresses Debian bug report #277989.
+
+	* docs/gimp-remote.1.in: document the new option.
+
 2004-11-21  Manish Singh  <yosh@gimp.org>
 
 	* configure.in: reverted previous change, as not all the lv.pos are
diff --git a/docs/gimp-remote.1.in b/docs/gimp-remote.1.in
index c678a819f0..dcdf5c0df4 100644
--- a/docs/gimp-remote.1.in
+++ b/docs/gimp-remote.1.in
@@ -4,7 +4,8 @@ gimp-remote - tells a running GIMP to open a (local or remote) image file.
 .SH SYNOPSIS
 .B gimp-remote
 [\-h] [\-\-help] [-v] [\-\-version] [\-\-display \fIdisplay\fP]
-[\-e] [\-\-existing] [-q] [\-\-query] \fIfilename\fP ...
+[\-e] [\-\-existing] [-q] [\-\-query]  [\-s] [\-\-no\-splash]
+\fIfilename\fP ...
 
 .SH DESCRIPTION
 .PP
@@ -41,6 +42,9 @@ If no running GIMP instance is found, don't start a new one but exit.
 .B \-q, \-\-query
 Check if GIMP is running and exit. A status code of 0 indicates that
 a GIMP toolbox window has been found on this display.
+.TP 8
+.B \-s, \-\-no\-splash
+When starting GIMP, do not show the splash screen.
 
 .SH EXAMPLES
 .TP
diff --git a/tools/gimp-remote.c b/tools/gimp-remote.c
index 7cc76fcc25..a386852066 100644
--- a/tools/gimp-remote.c
+++ b/tools/gimp-remote.c
@@ -62,8 +62,9 @@ static void start_new_gimp (GdkScreen   *screen,
                             GString     *file_list) G_GNUC_NORETURN;
 
 
-static gboolean  existing = FALSE;
-static gboolean  query    = FALSE;
+static gboolean  existing  = FALSE;
+static gboolean  query     = FALSE;
+static gboolean  no_splash = FALSE;
 
 
 static GdkWindow *
@@ -176,6 +177,7 @@ usage (const gchar *name)
            "  --display <display>   Use the designated X display.\n"
            "  -e, --existing        Use a running GIMP only, never start a new one.\n"
            "  -q, --query           Query if a GIMP is running, then quit.\n"
+           "  -s, --no-splash       Start GIMP w/o showing the startup window.\n"
            "\n");
   g_print ("Example:  %s http://www.gimp.org/icons/frontpage-small.gif\n"
 	   "     or:  %s localfile.png\n\n", name, name);
@@ -204,6 +206,9 @@ start_new_gimp (GdkScreen   *screen,
   file_list = g_string_prepend (file_list, "--display\n");
   g_free (display_name);
 
+  if (no_splash)
+    file_list = g_string_prepend (file_list, "--no-splash\n");
+
   file_list = g_string_prepend (file_list, "gimp\n");
 
   argv = g_strsplit (file_list->str, "\n", 0);
@@ -311,6 +316,10 @@ parse_option (const gchar *progname,
     {
       query = TRUE;
     }
+  else if (strcmp (arg, "-s") == 0 || strcmp (arg, "--no-splash") == 0)
+    {
+      no_splash = TRUE;
+    }
   else if (strcmp (arg, "-n") == 0 || strcmp (arg, "--new") == 0)
     {
       /*  accepted for backward compatibility; this is now the default  */