diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps
index ba19bf1537e..a5b1457e359 100755
--- a/Build-tools/Do-all-build-steps
+++ b/Build-tools/Do-all-build-steps
@@ -26,7 +26,7 @@ cd "$WD"
 # Create a build directory tree
 bk export $BD
 cd "$BD"
-chmod -R a+rw,g+rw .
+chmod -R u+rw,g+rw .
 
 #Make it easy to remove an old build
 umask 002
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 4bb981aba14..3dd4a4a6acd 100755
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -48,7 +48,7 @@ rm $BASE/include/Makefile*; rm $BASE/include/*.in
 
 cp -p tests/*.res tests/*.tst tests/*.pl $BASE/tests
 cp -p support-files/* $BASE/support-files
-cp -p libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_a.a libmysql_r/.libs/libmysqlclient.so* libmysql_r/libmysqlclient.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib
+cp -p libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a $BASE/lib
 cp -r -p sql/share/* $BASE/share/mysql; rm -f $BASE/share/mysql/Makefile* $BASE/share/mysql/*/*.OLD $BASE/share/CVS $BASE/share/*/CVS 
 
 cp -p scripts/* $BASE/bin