diff --git a/ChangeLog b/ChangeLog
index cf131275b0..8b86843fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -126,7 +126,7 @@ MPlayer (1.0)
     * -rawaudio/-rawvideo requires -demuxer rawaudio/-demuxer rawvideo
     * libdvdcss updated to 1.2.9
     * ~/.dvdcss is used instead of ~/.mplayer/DVDKeys for cached CSS keys
-    * configure check and compiler optimizations for VIA C3 and Pentium-M
+    * configure check and compiler optimizations for VIA C3, C3-2 and Pentium-M
     * configure check and compiler optimizations for AMD-64 extended
     * configure can now run with cross compiling, new configure option
       --enable-cross-compile
diff --git a/configure b/configure
index 63c20e1773..0581267675 100755
--- a/configure
+++ b/configure
@@ -914,6 +914,8 @@ case "$host_arch" in
         _mmx2=no
 	if test "$pmodel" -ge 9; then
 		proc=c3-2
+	elif test "$pmodel" -ge 7; then
+		proc=c3
 	else
 		proc=i686
 	fi
@@ -973,7 +975,7 @@ EOF
     if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then
       cc_check -march=$proc $cpuopt=$proc  || proc=i586
     fi
-    if test "$proc" = "i586" || test "$proc" = "c3" ; then
+    if test "$proc" = "i586" || test "$proc" = "c3" || test "$proc" = "c3-2"; then
       cc_check -march=$proc $cpuopt=$proc  || proc=i486
     fi
     if test "$proc" = "i486" ; then