diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 402ae196638..179f06ae891 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,3 +1,4 @@
 mwagner@work.mysql.com
 mwagner@evoq.home.mwagner.org
 monty@donna.mysql.com
+monty@work.mysql.com
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index 51c0d6a152e..accf330df1c 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -27,7 +27,9 @@ VER_NO_DASH=`echo $VER | sed -e "s|-.*$||"`
 
 echo "Removing old MySQL packages"
 rm -rf $rpmdir/BUILD/mysql-*
+rm -f $rpmdir/SOURCES/mysql-*
 rm -f $rpmdir/SRPMS/MySQL-*
+rm -f $rpmdir/SPEC/mysql-*
 
 echo "Building RPM for MySQL version $VER on $bmachine"
 
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 2d1107dddbc..d5cfe4e9f54 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -334,7 +334,6 @@ fi
 %attr(755, root, root) /usr/bin/mysqlshow
 %attr(755, root, root) /usr/bin/mysqlbinlog
 
-%attr(644, root, man) %doc /usr/man/man1/mysql.1*
 %attr(644, root, man) %doc /usr/man/man1/mysql.1*
 %attr(644, root, man) %doc /usr/man/man1/isamchk.1*
 %attr(644, root, man) %doc /usr/man/man1/isamlog.1*