diff --git a/my_config.h b/my_config.h
index 6dd04f9..5591754 100644
--- a/my_config.h
+++ b/my_config.h
@@ -7,24 +7,18 @@
  * Note: this may well fail if user tries to use gcc's -I- option.
  * But that option is deprecated anyway.
  */
-#ifdef __i386__
-#include "my_config_i386.h"
-#endif
-#ifdef __x86_64__
+#if defined(__x86_64__)
 #include "my_config_x86_64.h"
-#endif
-#ifdef __ia64__
+#elif defined(__ia64__)
 #include "my_config_ia64.h"
-#endif
-#ifdef __ppc__
-#include "my_config_ppc.h"
-#endif
-#ifdef __ppc64__
+#elif defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ppc64__)
 #include "my_config_ppc64.h"
-#endif
-#ifdef __s390__
+#elif defined(__ppc__)
+#include "my_config_ppc.h"
+#elif defined(__s390x__)
+#include "my_config_s390x.h"
+#elif defined(__s390__)
 #include "my_config_s390.h"
 #endif
-#ifdef __s390x__
-#include "my_config_s390x.h"
-#endif
diff --git a/mysql.spec b/mysql.spec
index 4ea02e2..7dc7c1d 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
 Version: 5.0.16
-Release: 2
+Release: 3
 Summary: MySQL client programs and shared libraries.
 License: GPL
 Group: Applications/Databases
@@ -378,6 +378,10 @@ fi
 %{_datadir}/sql-bench
 
 %changelog
+* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-3
+- my_config.h needs to guard against 64-bit platforms that also define the
+  32-bit symbol
+
 * Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2
 - oops, looks like we want uname -i not uname -m