diff --git a/.cvsignore b/.cvsignore
index 628b305..3a2f942 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-3.23.38.tar.bz2
+mysql-3.23.40.tar.bz2
diff --git a/mysql.init b/mysql.init
index f8a2d9c..92b7627 100644
--- a/mysql.init
+++ b/mysql.init
@@ -33,7 +33,7 @@ start(){
 	    	return $ret
 	    fi
 	fi
-	chown mysql.mysql /var/lib/mysql
+	chown -R mysql.mysql /var/lib/mysql
 	chmod 0755 /var/lib/mysql
 	/usr/bin/safe_mysqld  --defaults-file=/etc/my.cnf >/dev/null 2>&1 &
 	ret=$?
diff --git a/mysql.spec b/mysql.spec
index 1bf5ea1..bcb67a6 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,17 +1,18 @@
 Name: mysql
-Version: 3.23.38
-Release: 2a
+Version: 3.23.40
+Release: 1
 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}.tar.bz2
 Source1: mysql.init
 Source2: mysql.logrotate
 Source3: my.cnf
 URL: http://www.mysql.com
-BuildRoot: %{_tmppath}/mysql-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Summary: MySQL client program and shared library
 License: GPL/LGPL
 Group: Applications/Databases
 Prereq: /sbin/ldconfig, /sbin/install-info, grep,  fileutils, chkconfig
 BuildRequires: gperf, perl, db3-devel, readline-devel
+BuildRequires: gcc-c++, ncurses-devel, zlib-devel
 Requires: bash >= 2
 Conflicts: MySQL
 Obsoletes: mysql-client mysql-bench mysql-perl
@@ -59,8 +60,8 @@ header files that are needed for developing your own MySQL applications.
 %setup -q 
 
 %build
-CFLAGS="%{optflags} -D_GNU_SOURCE"
-CXXFLAGS="%{optflags} -D_GNU_SOURCE"
+CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+CXXFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 %configure --without-debug \
 	--without-readline \
@@ -71,6 +72,8 @@ CXXFLAGS="%{optflags} -D_GNU_SOURCE"
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-mysqld-user="mysql" \
         --with-extra-charsets=all \
+	--with-innodb \
+	--enable-assembler \
 %ifnarch alpha
         --with-berkeley-db --enable-large-files=yes --enable-largefile=yes \
 %endif
@@ -78,7 +81,7 @@ CXXFLAGS="%{optflags} -D_GNU_SOURCE"
 
 make
 make check
-%ifnarch s390 s390x
+%ifnarch s390 s390x ia64
 make test
 %endif
 
@@ -125,7 +128,7 @@ if [ $1 = 1 ]; then
     /sbin/chkconfig --add mysqld
 fi
 /bin/chmod 0755 /var/lib/mysql
-
+/bin/touch /var/log/mysqld.log
 
 %preun
 if [ $1 = 0 ]; then
@@ -148,6 +151,7 @@ if [ $1 = 0 ] ; then
     /sbin/ldconfig /usr/lib/mysql
 fi
 
+
 %postun server
 if [ $1 -ge 1 ]; then
     /sbin/service mysqld condrestart >/dev/null 2>&1 || :
@@ -177,7 +181,7 @@ fi
 %dir /usr/share/mysql
 /usr/share/mysql/*
 
-%config /etc/my.cnf
+%config(noreplace) /etc/my.cnf
 
 %files server
 %defattr(-,root,root)
@@ -186,7 +190,7 @@ fi
 /usr/libexec/*
 /etc/rc.d/init.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/run/mysqld
-%config /etc/logrotate.d/mysqld
+%config(noreplace) /etc/logrotate.d/mysqld
 %attr(0755,mysql,mysql) %dir /var/lib/mysql
 %ghost %attr(0640,mysql,mysql) /var/log/mysqld.log
 
@@ -198,6 +202,23 @@ fi
 /usr/lib/mysql/libmysqlclient*.so
 
 %changelog
+* Sat Jul 21 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.40, bugfix release
+- Add zlib-devel to buildrequires:
+
+* Fri Jul 20 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- BuildRequires-tweaking
+
+* Thu Jun 28 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Reenable test, but don't run them for s390, s390x or ia64
+- Make /etc/my.cnf config(noplace). Same for /etc/logrotate.d/mysqld
+
+* Thu Jun 14 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.29
+- enable innodb
+- enable assembly again
+- disable tests for now..
+
 * Tue May 15 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - 3.23.38
 - Don't use BDB on Alpha - no fast mutexes
diff --git a/sources b/sources
index 3787fde..2e1e9d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e95b9a2d7decfd7f51395acf6a558c11  mysql-3.23.38.tar.bz2
+0a91bf40b9dee8b642c006e2e6b968b1  mysql-3.23.40.tar.bz2