diff -NurpP beecrypt-4.1.2/acinclude.m4 beecrypt-4.1.2-archupdate/acinclude.m4
--- beecrypt-4.1.2/acinclude.m4	2004-12-19 21:16:35.000000000 +0100
+++ beecrypt-4.1.2-archupdate/acinclude.m4	2006-03-16 16:56:58.577897500 +0100
@@ -454,9 +454,8 @@ AC_DEFUN([BEECRYPT_GNU_CC],[
       ;;
     esac
   fi
-  if test "$ac_enable_debug" = yes; then
-    BEECRYPT_CFLAGS_REM([-O2])
-    CFLAGS="$CFLAGS -Wall -pedantic"
+  if true; then
+    CFLAGS="$CFLAGS -Wall"
   else
     # Generic optimizations, including cpu tuning
     BEECRYPT_CFLAGS_REM([-g])
@@ -566,9 +565,8 @@ AC_DEFUN([BEECRYPT_GNU_CXX],[
       ;;
     esac
   fi
-  if test "$ac_enable_debug" = yes; then
-    BEECRYPT_CXXFLAGS_REM([-O2])
-    CXXFLAGS="$CXXFLAGS -Wall -pedantic"
+  if true; then
+    CXXFLAGS="$CXXFLAGS -Wall"
   else
     # Generic optimizations, including cpu tuning
     BEECRYPT_CXXFLAGS_REM([-g])
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 17:01:33.807098250 +0100
@@ -501,20 +501,25 @@ 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)
+  i586|pentium|pentium-mmx)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
     ;;
-  i686)
+  i686|pentium*)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
+    ;;
+  nocona)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X68_64"
+    ;;
+  athlon64|athlon-fx|opteron|k8)
+    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_X68_64"
+    ;;
+  athlon*)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
     ;;
   ia64)
@@ -523,28 +528,6 @@ if test "$ac_enable_debug" != yes; then
   m68k)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_M68K"
     ;;
-  pentium)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586"
-    ;;
-  pentium-mmx)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I586 -DOPTIMIZE_MMX"
-    CFLAGS="$CFLAGS -mmmx"
-    ;;
-  pentiumpro)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686"
-    ;;
-  pentium2)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX"
-    CFLAGS="$CFLAGS -mmmx"
-    ;;
-  pentium3)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE"
-    CFLAGS="$CFLAGS -msse"
-    ;;
-  pentium4)
-    CPPFLAGS="$CPPFLAGS -DOPTIMIZE_I686 -DOPTIMIZE_MMX -DOPTIMIZE_SSE -DOPTIMIZE_SSE2"
-    CFLAGS="$CFLAGS -msse2"
-    ;;
   powerpc)
     CPPFLAGS="$CPPFLAGS -DOPTIMIZE_POWERPC"
     ;;