diff --git a/ChangeLog b/ChangeLog
index 5590aab9e6..ca273057c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-22  Sven Neumann  <sven@gimp.org>
+
+	* tools/gimp-remote.c: use putenv(); setenv() isn't available
+	everywhere (bug #137930).
+
 2004-03-22  Michael Natterer  <mitch@gimp.org>
 
 	* app/display/gimpdisplayshell.c (gimp_display_shell_reconnect):
diff --git a/tools/gimp-remote.c b/tools/gimp-remote.c
index 89e0227d16..03e9a6a1f6 100644
--- a/tools/gimp-remote.c
+++ b/tools/gimp-remote.c
@@ -188,7 +188,7 @@ start_new_gimp (GdkScreen   *screen,
   gint          i;
 
   if (startup_id)
-    setenv ("DESKTOP_STARTUP_ID", startup_id, TRUE);
+    putenv (g_strdup_printf ("DESKTOP_STARTUP_ID=%s", startup_id));
 
   if (file_list->len > 0)
     file_list = g_string_prepend (file_list, "\n");