diff --git a/.cvsignore b/.cvsignore
index 1520130..43ccb21 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-3.23.24-beta.tar.gz
+mysql-3.23.26-beta.tar.gz
diff --git a/mysql.init b/mysql.init
index 32b4415..5ed5384 100644
--- a/mysql.init
+++ b/mysql.init
@@ -43,10 +43,12 @@ start(){
 
 stop(){
 	echo -n "Shutting down MySQL server"
+	killproc safe_mysqld
 	killproc mysqld
 	ret=$?
 	[ $ret -eq 0 ] && rm -f /var/lock/subsys/mysqld
 	[ $ret -eq 0 ] && rm -f /var/lib/mysql/mysql.sock
+	mysqladmin shutdown > /dev/null  2>& 1
 	echo
 	return $ret
 }
diff --git a/mysql.spec b/mysql.spec
index 009281f..86db44a 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 3.23.24
+Version: 3.23.26
 Release: 1
 Source0: http://www.mysql.com/Downloads/MySQL-3.23/mysql-%{version}-beta.tar.gz
 Source1: mysql.init
@@ -55,7 +55,6 @@ header files that are needed for developing your own MySQL applications.
 
 
 %build
-
 %configure --without-debug \
 	--without-readline \
 	--enable-shared \
@@ -143,7 +142,7 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc INSTALL* PUBLIC README COPYING* 
+%doc INSTALL* README COPYING* 
 %doc Docs/manual* Docs/mysqld_error.txt
 
 # /usr/bin/* except mysqladmin and safe_mysqld
@@ -184,6 +183,23 @@ fi
 /usr/lib/mysql/libmysqlclient*.so
 
 %changelog
+* Wed Oct 18 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.26, which among other fixes now uses mkstemp()
+  instead of tempnam().
+- revert changes made yesterday, Jakub fixed the compiler
+ 
+* Tue Oct 17 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- use the compat C++ compiler FTTB. Argh.
+- add requirement of ncurses4 (see above)
+
+* Sun Oct 01 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- 3.23.25
+- fix shutdown problem (#17956)
+
+* Tue Sep 26 2000 Trond Eivind Glomsrød <teg@redhat.com>
+- Don't try to include no-longer-existing PUBLIC file
+  as doc (#17532)
+
 * Thu Sep 12 2000 Trond Eivind Glomsrød <teg@redhat.com>
 - rename config file to /etc/my.cnf, which is what
   mysqld wants... doh. (#17432)
diff --git a/sources b/sources
index f943648..3967ce9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a4d1e1075db34675d91280bfe81aa891  mysql-3.23.24-beta.tar.gz
+b24fa6bb945d53f739b2dfa815abc992  mysql-3.23.26-beta.tar.gz