diff --git a/my.cnf b/my.cnf
index 2a915fc..1423e03 100644
--- a/my.cnf
+++ b/my.cnf
@@ -1,11 +1,14 @@
 [mysqld]
 datadir=/var/lib/mysql
 socket=/var/lib/mysql/mysql.sock
+# Default to using old password format for compatibility with mysql 3.x
+# clients (those using the mysqlclient10 compatibility package).
+old_passwords=1
      
 [mysql.server]
 user=mysql
 basedir=/var/lib
 
-[safe_mysqld]
+[mysqld_safe]
 err-log=/var/log/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid
diff --git a/mysql.spec b/mysql.spec
index cd371bc..b1897e0 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 4.1.7
-Release: 3
+Release: 4
 Source0: http://dev.mysql.com/get/Downloads/MySQL-4.1/mysql-%{version}.tar.gz
 Source1: mysql.init
 Source2: mysql.logrotate
@@ -351,6 +351,10 @@ fi
 %{_datadir}/sql-bench
 
 %changelog
+* Tue Nov 23 2004 Tom Lane <tgl@redhat.com> 4.1.7-4
+- Turn off old_passwords in default /etc/my.cnf file, for better compatibility
+  with mysql 3.x clients (per suggestion from Joe Orton).
+
 * Fri Oct 29 2004 Tom Lane <tgl@redhat.com> 4.1.7-3
 - Handle ldconfig more cleanly (put a file in /etc/ld.so.conf.d/).
 
@@ -385,7 +389,7 @@ fi
 - BR time
 
 * Tue Mar 16 2004 Tom Lane <tgl@redhat.com> 3.23.58-8
-- repair logfile attributes in %files, per bug #102190
+- 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