diff --git a/bochs/configure b/bochs/configure
index 933d6d96e..4ca4af279 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.317 2006/04/05 18:49:30 sshwarts Exp .
+# From configure.in Id: configure.in,v 1.318 2006/04/06 19:14:34 sshwarts Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -35727,6 +35727,7 @@ _ACEOF
 
 fi;
 
+support_mmx=1
 echo "$as_me:$LINENO: checking for MMX support" >&5
 echo $ECHO_N "checking for MMX support... $ECHO_C" >&6
 # Check whether --enable-mmx or --disable-mmx was given.
@@ -35746,6 +35747,7 @@ echo "${ECHO_T}no" >&6
 #define BX_SUPPORT_MMX 0
 _ACEOF
 
+    support_mmx=0
    fi
 
 else
@@ -35951,12 +35953,21 @@ _ACEOF
 
 else
 
-    echo "$as_me:$LINENO: result: no" >&5
+    if test "$bx_cpu_level" -ge 6 -a "$support_mmx" = 1; then
+      echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+      cat >>confdefs.h <<\_ACEOF
+#define BX_SUPPORT_SEP 1
+_ACEOF
+
+    else
+      echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-    cat >>confdefs.h <<\_ACEOF
+      cat >>confdefs.h <<\_ACEOF
 #define BX_SUPPORT_SEP 0
 _ACEOF
 
+    fi
 
 
 fi;
diff --git a/bochs/configure.in b/bochs/configure.in
index 3af853f46..8ae4b3a32 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.318 2006-04-06 19:14:34 sshwarts Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.319 2006-05-15 17:40:16 sshwarts Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -1484,6 +1484,7 @@ AC_ARG_ENABLE(vme,
     ]
   )
 
+support_mmx=1
 AC_MSG_CHECKING(for MMX support)
 AC_ARG_ENABLE(mmx,
   [  --enable-mmx                      MMX support],
@@ -1493,6 +1494,7 @@ AC_ARG_ENABLE(mmx,
    elif test "$enableval" = no; then
     AC_MSG_RESULT(no)
     AC_DEFINE(BX_SUPPORT_MMX, 0)
+    support_mmx=0
    fi
    ],
   [
@@ -1615,8 +1617,13 @@ AC_ARG_ENABLE(sep,
    fi
    ],
   [
-    AC_MSG_RESULT(no)
-    AC_DEFINE(BX_SUPPORT_SEP, 0)
+    if test "$bx_cpu_level" -ge 6 -a "$support_mmx" = 1; then
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(BX_SUPPORT_SEP, 1)
+    else
+      AC_MSG_RESULT(no)
+      AC_DEFINE(BX_SUPPORT_SEP, 0)
+    fi
     ]
   )