--- openssl-0.9.8q/config-orig	2010-03-09 12:08:24.000000000 -0500
+++ openssl-0.9.8q/config	2010-12-19 18:45:47.000000000 -0500
@@ -269,9 +269,25 @@
 	    Power*)
 		echo "ppc-apple-darwin${VERSION}"
 		;;
-	    *)
-		echo "i386-apple-darwin${VERSION}"
-		;;
+
+		*)
+			case "$SDK_NAME" in
+				iphoneos*) # Xcode, armv6 architecture
+				echo "arm-apple-iphone"
+				;;
+	
+				iphonesimulator*) # Xcode, x86 architecture
+				echo "x86-apple-simulator"
+				;;
+			
+				macosx*) # Xcode, x64 architecture
+				echo "x86_64-apple-darwin"
+				;;
+
+				*) # Terminal, no Xcode, x64 architecture
+				echo "x86_64-apple-darwin"
+				;;
+			esac
 	esac
 	exit 0
 	;;
@@ -524,7 +540,9 @@
 	;;
   ppc-apple-rhapsody) OUT="rhapsody-ppc-cc" ;;
   ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
-  i386-apple-darwin*) OUT="darwin-i386-cc" ;;
+  arm-apple-iphone) OUT="iphone-arm-$CC"; options="$options no-dso" ;;
+  x86-apple-simulator) OUT="apple_sim-x86-$CC"; options="$options no-dso" ;;
+  x86_64-apple-darwin) OUT="darwin-x86_64-$CC" ;;
   alpha-*-linux2)
         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
 	case ${ISA:-generic} in