diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1caf0ef248b..13649995233 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-16  Roger Sayle  <roger@eyesopen.com>
+	    Paolo Bonzini  <bonzini@gnu.org>
+
+	* scripts/jar.in: Fix portability problems with Solaris /bin/sh.
+
 2008-07-08  Matthias Klose  <doko@ubuntu.com>
 
 	* libtool-version: Bump soversion.
diff --git a/libjava/scripts/jar.in b/libjava/scripts/jar.in
index 82ea10c2912..e9cb9f5822e 100644
--- a/libjava/scripts/jar.in
+++ b/libjava/scripts/jar.in
@@ -96,7 +96,7 @@ copy () {
       return 0
     fi
 
-    if test -e "$2"/"$1"; then
+    if test -f "$2"/"$1"; then
       error "$1": Duplicate entry.
     fi
     dir=`dirname "$1"`
@@ -249,8 +249,7 @@ jar_list_verbose () {
 }
 
 # mkdir -p emulation based on the mkinstalldirs script.
-mkdir_p ()
-{
+func_mkdir_p () {
   for file
   do
     case $file in
@@ -290,7 +289,7 @@ mkdir_p ()
 if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
   mkdir_p='mkdir -p'
 else
-  mkdir_p='mkdir_p'
+  mkdir_p='func_mkdir_p'
   test -d ./-p && rmdir ./-p
   test -d ./--version && rmdir ./--version
 fi