diff --git a/win/configure.bat b/win/configure.bat
index 7f22f03b..e145c020 100644
--- a/win/configure.bat
+++ b/win/configure.bat
@@ -132,8 +132,41 @@ if %LIBTYPE% == dll (set FLAGS1=/D "__GMP_LIBGMP_DLL" /D "__GMP_WITHIN_GMP" /D "
 echo (set FLAGS1=%FLAGS1%) >> config.params.bat
 set MPNPATH=.
 if %ABI% == 32 (
-	if %CPU% == k8      (set MPNPATH=x86w x86w\k7)
-	if %CPU% == nehalem (set MPNPATH=x86w)
+	if %CPU% == x86		(set MPNPATH=x86w)
+	if %CPU% == i386	(set MPNPATH=x86w)
+	if %CPU% == i486	(set MPNPATH=x86w)
+	if %CPU% == i586	(set MPNPATH=x86w)
+	if %CPU% == pentium	(set MPNPATH=x86w)
+	if %CPU% == pentiummmx	(set MPNPATH=x86w)
+	if %CPU% == pentiumpro	(set MPNPATH=x86w x86w\p6)
+	if %CPU% == i686	(set MPNPATH=x86w x86w\p6)
+	if %CPU% == pentium2	(set MPNPATH=x86w x86w\p6 x86w\p6\mmx)
+	if %CPU% == pentium3	(set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == k6		(set MPNPATH=x86w)
+	if %CPU% == k62		(set MPNPATH=x86w)
+	if %CPU% == k63		(set MPNPATH=x86w)
+	if %CPU% == k7		(set MPNPATH=x86w)
+	if %CPU% == athlon	(set MPNPATH=x86w)
+	if %CPU% == pentium4	(set MPNPATH=x86w x86w\pentium4 x86w\pentium4\mmx x86w\pentium4\sse2)
+	if %CPU% == prescott	(set MPNPATH=x86w x86w\pentium4 x86w\pentium4\mmx x86w\pentium4\sse2)
+	if %CPU% == core	(set MPNPATH=x86w x86w\pentium4 x86w\pentium4\mmx x86w\pentium4\sse2)
+	if %CPU% == viac3	(set MPNPATH=x86w)
+	if %CPU% == viac32	(set MPNPATH=x86w)
+	if %CPU% == x86_64	(set MPNPATH=x86w)
+	if %CPU% == netburst	(set MPNPATH=x86w x86w\pentium4 x86w\pentium4\mmx x86w\pentium4\sse2)
+	if %CPU% == netburstlahf	(set MPNPATH=x86w x86w\pentium4 x86w\pentium4\mmx x86w\pentium4\sse2)
+	if %CPU% == k8           (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == k10          (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == k102         (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == k103         (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == bobcat       (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == core2        (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == penryn       (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == nehalem      (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == westmere     (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == sandybridge  (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == atom         (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
+	if %CPU% == nano         (set MPNPATH=x86w x86w\p6 x86w\p6\mmx x86w\p6\p3mmx)
 )
 if %ABI% == 64 (
 	if %CPU% == x86_64       (set MPNPATH=x86_64w)