diff --git a/configure b/configure
index e82b67a3cd..efb0612dbb 100755
--- a/configure
+++ b/configure
@@ -1641,7 +1641,7 @@ case "$host_arch" in
 	fi
 	;;
     6) iproc=686
-	if test "$pmodel" -eq 15; then
+	if test "$pmodel" -ge 15; then
 		proc=core2
 	elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then
 		proc=pentium-m
diff --git a/cpuinfo.c b/cpuinfo.c
index 50517696f9..1d5b3d3ab2 100644
--- a/cpuinfo.c
+++ b/cpuinfo.c
@@ -241,10 +241,9 @@ main(int argc, char **argv)
     stepping = regs.eax & 0xf;
 
     if (family == 0xf)
-    {
       family += (regs.eax >> 20) & 0xff;
+    if (family == 0xf || family == 6)
       model += ((regs.eax >> 16) & 0xf) << 4;
-    }
 
     printf("cpu family\t: %d\n"
            "model\t\t: %d\n"