diff --git a/ChangeLog b/ChangeLog
index 2242310d9..8d2488c12 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ $Source$
 2003-06-02 Michal Cihar  <nijel@users.sourceforge.net>
     * libraries/display_tbl.lib.php3, lang/*: Better text on button for
       executing bookmark (bug #745993).
+    * scripts/create-release.sh: Better checking for input, exit when cvs
+      doesn't work, don't include CVS and .cvsignore in tarballs, don't chmod
+      everything to 775.
 
 2003-06-02 Marc Delisle  <lem9@users.sourceforge.net>
     ### 2.5.1 released
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index b86301aab..4f7dbc840 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -71,8 +71,7 @@ END
 printf "\a"
 read do_release
 
-if [ $do_release != 'y' ]
-then
+if [ "$do_release" != 'y' ]; then
   exit
 fi
 
@@ -85,9 +84,18 @@ mkdir cvs
 cd cvs
 echo "Press [ENTER]!"
 cvs -d:pserver:anonymous@cvs1:/cvsroot/phpmyadmin login
+if [ $? -ne 0 ] ; then
+    echo "CVS login failed, bailing out"
+    exit 1
+fi
 cvs -z3 -d:pserver:anonymous@cvs1:/cvsroot/phpmyadmin co -P $branch phpMyAdmin
+if [ $? -ne 0 ] ; then
+    echo "CVS checkout failed, bailing out"
+    exit 2
+fi
 
 date > phpMyAdmin/RELEASE-DATE-$1
+find phpMyAdmin \( -name .cvsignore -o -name CVS \) -print0 | xargs -0 rm -rf 
 mv phpMyAdmin phpMyAdmin-$1
 zip -9 -r phpMyAdmin-$1-php3.zip phpMyAdmin-$1
 tar cvzf phpMyAdmin-$1-php3.tar.gz phpMyAdmin-$1
@@ -107,7 +115,8 @@ echo "------"
 
 ls -la *.gz *.zip *.bz2
 cd ..
-chmod -R 775 cvs
+find cvs -type d -print0 | xargs -0 chmod 775
+find cvs -type f -print0 | xargs -0 chmod 664
 
 
 cat <<END