diff -NurpP beecrypt-4.1.2/configure.ac beecrypt-4.1.2-archupdate/configure.ac
--- beecrypt-4.1.2/configure.ac	2004-12-21 12:37:56.000000000 +0100
+++ beecrypt-4.1.2-archupdate/configure.ac	2006-03-16 16:03:51.330969000 +0100
@@ -501,50 +501,54 @@ if test "$ac_enable_debug" != yes; then
   arm*)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_ARM"
     ;;
-  athlon*)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386 -DOPTIMIZE_MMX"
-    CFLAGS="$CFLAGS -mmmx"
-    ;;
   i386)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I386"
     ;;
   i486)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I486"
     ;;
-  i586)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
-    ;;
-  i686)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
-    ;;
-  ia64)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
-    ;;
-  m68k)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_M68K"
-    ;;
-  pentium)
+  i586|pentium)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
     ;;
   pentium-mmx)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
     CFLAGS="$CFLAGS -mmmx"
     ;;
-  pentiumpro)
+  i686|pentiumpro)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
     ;;
   pentium2)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
     CFLAGS="$CFLAGS -mmmx"
     ;;
-  pentium3)
+  pentium3|pentium3m)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
     CFLAGS="$CFLAGS -msse"
     ;;
-  pentium4)
+  pentium4|pentium4m|prescott|pentium-m)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
     CFLAGS="$CFLAGS -msse2"
     ;;
+  nocona)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
+    ;;
+  athlon|athlon-tbird)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
+    CFLAGS="$CFLAGS -mmmx"
+    ;;
+  athlon-4|athlon-xp|athlon-mp)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
+    CFLAGS="$CFLAGS -mmmx -msse"
+    ;;
+  athlon64|athlon-fx|opteron|k8)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X86_64"
+    ;;
+  ia64)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_IA64"
+    ;;
+  m68k)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_M68K"
+    ;;
   powerpc)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
     ;;