diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 4c6c2435a..989355c3d 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-08  Eric Blake  <ebb9@byu.net>
+
+	* libc/argz/argz_insert.c (argz_insert): Don't die with EINVAL when
+	before is NULL.
+
 2005-09-08  Brian Dessent  <brian@dessent.net>
 
 	* sf_lrint.c (lrintf): Mask 'i0' correctly when extracting
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index 043a10193..8a9fb19b2 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 by  Red Hat, Incorporated. All rights reserved.
+/* Copyright (C) 2002, 2005 by  Red Hat, Incorporated. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software
  * is freely granted, provided that this notice is preserved.
@@ -20,7 +20,7 @@ _DEFUN (argz_insert, (argz, argz_len, before, entry),
   int len = 0;
 
   if (before == NULL)
-    argz_add(argz, argz_len, entry);
+    return argz_add(argz, argz_len, entry);
 
   if (before < *argz || before >= *argz + *argz_len)
     return EINVAL;