diff --git a/mysql.init b/mysql.init
index 7d306a5..26ed7c6 100644
--- a/mysql.init
+++ b/mysql.init
@@ -22,17 +22,17 @@ datadir="/var/lib/mysql"
 
 start(){
 	touch /var/log/mysqld.log
-	chown mysql.mysql /var/log/mysqld.log 
+	chown mysql:mysql /var/log/mysqld.log 
 	chmod 0640 /var/log/mysqld.log
 	if [ ! -d $datadir/mysql ] ; then
 	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db
 	    ret=$?
-	    chown -R mysql.mysql $datadir
+	    chown -R mysql:mysql $datadir
 	    if [ $ret -ne 0 ] ; then
 		return $ret;
 	    fi
 	fi
-	chown -R mysql.mysql $datadir
+	chown -R mysql:mysql $datadir
 	chmod 0755 $datadir
 	/usr/bin/safe_mysqld  --defaults-file=/etc/my.cnf >/dev/null 2>&1 &
 	ret=$?
diff --git a/mysql.spec b/mysql.spec
index 850b605..170ce86 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 3.23.58
-Release: 5
+Release: 9
 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source2: mysql.logrotate
@@ -10,6 +10,9 @@ Source999: filter-requires-mysql.sh
 Patch0: mysql-3.23.51-manfixes.patch
 Patch1: mysql-3.23.54-libdir.patch
 Patch2: mysql-errno.patch
+Patch3: mysql-3.23.58-hotcopy.patch
+Patch4: mysql-3.23.58-setpermission.patch
+Patch5: mysql-3.23.58-typo.patch
 URL: http://www.mysql.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client programs and shared libraries.
@@ -23,6 +26,8 @@ Requires: bash
 Conflicts: MySQL
 Requires: perl-DBI, perl-DBD-MySQL
 Obsoletes: mysql-client mysql-perl
+# make test requires time
+BuildRequires: time
 
 # Working around perl dependency checking bug in rpm FTTB. Remove later.
 %define __perl_requires %{SOURCE999}
@@ -82,6 +87,9 @@ MySQL.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 libtoolize --force
 aclocal
@@ -156,6 +164,9 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all*
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.cnf
 rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
 
+# compress manual
+bzip2 Docs/manual.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -204,12 +215,15 @@ fi
 if [ $1 -ge 1 ]; then
     /sbin/service mysqld condrestart >/dev/null 2>&1 || :
 fi
+if [ $1 = 0 ] ; then
+	userdel mysql >/dev/null 2>&1 || :
+fi
 
 
 %files
 %defattr(-,root,root)
-%doc INSTALL* README COPYING* 
-%doc Docs/manual* Docs/mysqld_error.txt
+%doc README COPYING* 
+%doc Docs/manual.txt.bz2 Docs/mysqld_error.txt
 
 # /usr/bin/* except mysqladmin and safe_mysqld
 %{_bindir}/[a-ln-rt-z]*
@@ -263,6 +277,7 @@ fi
 %config(noreplace) /etc/logrotate.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
 %ghost %attr(0640,mysql,mysql) /var/log/mysqld.log
+%config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
 
 %files devel
 %defattr(-,root,root)
@@ -276,6 +291,29 @@ fi
 %{_datadir}/sql-bench
 
 %changelog
+* Sat Apr 17 2004 Warren Togami <wtogami@redhat.com> 3.23.58-9
+- remove redundant INSTALL-SOURCE, manual.*
+- compress manual.txt.bz2
+- BR time
+
+* Tue Mar 16 2004 Tom Lane <tgl@redhat.com> 3.23.58-8
+- repair logfile attributes in %files, per bug #102190
+- repair quoting problem in mysqlhotcopy, per bug #112693
+- repair missing flush in mysql_setpermission, per bug #113960
+- repair broken error message printf, per bug #115165
+- delete mysql user during uninstall, per bug #117017
+- rebuilt
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Feb 24 2004 Tom Lane <tgl@redhat.com>
+- fix chown syntax in mysql.init
+- rebuild
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Tue Nov 18 2003 Kim Ho <kho@redhat.com> 3.23.58-5
 - update mysql.init to use anonymous user (UNKNOWN_MYSQL_USER) for
   pinging mysql server (#108779)