diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 15913cc51bc..a45de6ce699 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-05  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/27892:
+	* gij.cc (main): Use putenv.
+
 2006-06-03  Paolo Bonzini  <bonzini@gnu.org>
 
 	* scripts/jar.in: Ensure return with argument has non-empty argument.
diff --git a/libjava/gij.cc b/libjava/gij.cc
index 933fe503df4..817378f8bca 100644
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -101,7 +101,12 @@ main (int argc, char const** argv)
 
   if (! libpath || strcmp (libpath, newpath))
     {
-      setenv (LTDL_SHLIBPATH_VAR, newpath, 1);
+      char *buffer = (char *) JvMalloc (strlen (LTDL_SHLIBPATH_VAR)
+					+ strlen (newpath) + 2);
+      strcpy (buffer, LTDL_SHLIBPATH_VAR);
+      strcat (buffer, "=");
+      strcat (buffer, newpath);
+      putenv (buffer);
       JvFree (newpath);
 
       int error_code = execvp (argv[0], (char* const*) argv);