diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 28583a294f7ea56295f18a197a2585cb32ffc80d..15913cc51bcc2347addc682902822cd194f71e2d 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,10 +1,14 @@
+2006-06-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* scripts/jar.in: Ensure return with argument has non-empty argument.
+
 2006-06-01  Paolo Bonzini  <bonzini@gnu.org>
 
 	* configure.ac (ZIP, UNZIP): New programs.
 	(JAR): Fall back to bash script.  Generate it.
 	(BASH_JAR): New conditional.
 	* Makefile.am (bin_SCRIPTS): New.
-	* jar.in: New file.
+	* scripts/jar.in: New file.
 
 2006-06-01  Bryce McKinlay  <mckinlay@redhat.com>
 
diff --git a/libjava/scripts/jar.in b/libjava/scripts/jar.in
index bca85e7f0bd65d699b7c6c60c94dcd0f9b544865..a2964ded899d542bc118384fc373315234a3537c 100644
--- a/libjava/scripts/jar.in
+++ b/libjava/scripts/jar.in
@@ -263,6 +263,7 @@ mkdir_p ()
     shift
     IFS=$oIFS
 
+    errstatus=0
     for d
     do
       test "x$d" = x && continue