diff -ur openssl-SNAP-20050130.old/Configure openssl-SNAP-20050130/Configure
--- openssl-SNAP-20050130.old/Configure	2005-01-24 17:00:09.000000000 +0100
+++ openssl-SNAP-20050130/Configure	2005-01-31 01:04:44.000000000 +0100
@@ -510,8 +510,11 @@
 ##### Sony NEWS-OS 4.x
 "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
 
-##### GNU Hurd
-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
+##### Glibc-based systems (on any kernel)
+"i386-glibc","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"i486-glibc","gcc:-DL_ENDIAN -DTERMIOS -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"i586-glibc","gcc:-DL_ENDIAN -DTERMIOS -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"i686-glibc","gcc:-DL_ENDIAN -DTERMIOS -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 
 ##### OS/2 EMX
 "OS2-EMX", "gcc::::::::",
diff -ur openssl-SNAP-20050130.old/config openssl-SNAP-20050130/config
--- openssl-SNAP-20050130.old/config	2005-01-26 21:00:10.000000000 +0100
+++ openssl-SNAP-20050130/config	2005-01-31 01:03:50.000000000 +0100
@@ -163,8 +163,8 @@
 	echo "${MACHINE}-whatever-linux1"; exit 0
 	;;
 
-    GNU*)
-	echo "hurd-x86"; exit 0;
+    GNU:*|GNU/*:*)
+	echo "${MACHINE}-glibc"; exit 0;
 	;;
 
     LynxOS:*)