diff --git a/.gitignore b/.gitignore
index f65bfb8..9a83bd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .*.swp
 bin
 src
+lib
 include/openssl
 *.gz
 *.framework
diff --git a/build-libssl.sh b/build-libssl.sh
index 9e25dd7..6ca80e3 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -28,8 +28,8 @@ set -u
 DEFAULTVERSION="1.0.2l"
 
 # Default (=full) set of architectures (OpenSSL <= 1.0.2) or targets (OpenSSL >= 1.1.0) to build
-DEFAULTARCHS="ios_x86_64 ios_i386 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64 mac_i386"
-DEFAULTTARGETS="ios-sim-cross-x86_64 ios-sim-cross-i386 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64 macos-i386"
+DEFAULTARCHS="ios_x86_64 ios_arm64 ios_armv7s ios_armv7 tv_x86_64 tv_arm64 mac_x86_64"
+DEFAULTTARGETS="ios-sim-cross-x86_64 ios64-cross-arm64 ios-cross-armv7s ios-cross-armv7 tvos-sim-cross-x86_64 tvos64-cross-arm64 macos64-x86_64"
 
 # Minimum iOS/tvOS SDK version to build for
 MACOS_MIN_SDK_VERSION="10.11"
diff --git a/create-openssl-framework.sh b/create-openssl-framework.sh
index c61862c..09c5fcd 100755
--- a/create-openssl-framework.sh
+++ b/create-openssl-framework.sh
@@ -62,10 +62,14 @@ if [ $FWTYPE == "dynamic" ]; then
         CROSS_SDK="${PLATFORM}${SDKVERSION}.sdk"
         SDK="${CROSS_TOP}/SDKs/${CROSS_SDK}"
 
-        if [[ $PLATFORM == "AppleTV"* ]]; then
+        if [[ $PLATFORM == AppleTVSimulator* ]]; then
+            MIN_SDK="-tvos_simulator_version_min 9.0"
+        elif [[ $PLATFORM == AppleTV* ]]; then
             MIN_SDK="-tvos_version_min 9.0"
         elif [[ $PLATFORM == MacOSX* ]]; then
             MIN_SDK="-macosx_version_min 10.11"
+        elif [[ $PLATFORM == iPhoneSimulator* ]]; then
+            MIN_SDK="-ios_simulator_version_min 8.0"
         else
             MIN_SDK="-ios_version_min 8.0"
         fi