diff --git a/build-libssl.sh b/build-libssl.sh
index 9422b4a..df15197 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -32,7 +32,7 @@ DEFAULTTARGETS=`cat <<TARGETS
 ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e
 macos64-x86_64 macos64-arm64
 mac-catalyst-x86_64 mac-catalyst-arm64
-watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64
+watchos-cross-armv7k watchos-cross-arm64_32 watchos-sim-cross-x86_64 watchos-sim-cross-i386
 tvos-sim-cross-x86_64 tvos64-cross-arm64
 TARGETS`
 
@@ -579,6 +579,9 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
       *_watchos_sim_x86_64.h)
         DEFINE_CONDITION="TARGET_OS_SIMULATOR && TARGET_CPU_X86_64 || TARGET_OS_EMBEDDED"
       ;;
+      *_watchos_sim_i386.h)
+        DEFINE_CONDITION="TARGET_OS_SIMULATOR && TARGET_CPU_X86 || TARGET_OS_EMBEDDED"
+      ;;
       *_tvos_arm64.h)
         DEFINE_CONDITION="TARGET_OS_TV && TARGET_OS_EMBEDDED && TARGET_CPU_ARM64"
       ;;
diff --git a/config/20-all-platforms.conf b/config/20-all-platforms.conf
index 894b3fb..ab39cc9 100644
--- a/config/20-all-platforms.conf
+++ b/config/20-all-platforms.conf
@@ -45,7 +45,7 @@ my %targets = ();
 
     ## Apple iOS
 
-    # Device (arm64)
+    # Device
     "ios64-cross-arm64" => {
         inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
         cflags           => add("-arch arm64"),
@@ -53,7 +53,6 @@ my %targets = ();
         perlasm_scheme   => "ios64",
         sys_id           => "iOS",
     },
-    # Device (arm64e)
     "ios64-cross-arm64e" => {
         inherit_from     => [ "darwin-common", "ios-cross-base", asm("aarch64_asm") ],
         cflags           => add("-arch arm64e"),
@@ -61,12 +60,11 @@ my %targets = ();
         perlasm_scheme   => "ios64",
         sys_id           => "iOS",
     },
-    # Simulator (x86_64)
+    # Simulator
     "ios-sim-cross-x86_64" => {
         inherit_from     => [ "darwin64-x86_64-cc", "ios-cross-base" ],
         sys_id           => "iOS",
     },
-    # Simulator (arm64)
     "ios-sim-cross-arm64" => {
         inherit_from     => [ "darwin64-arm64-cc", "ios-cross-base" ],
         cflags           => add("-target arm64-apple-ios13.0-simulator -mios-version-min=13.0"),
@@ -85,23 +83,21 @@ my %targets = ();
         perlasm_scheme   => "ios64",
     },
 
-    # Device (x86_64)
+    # Device
     "macos64-x86_64" => {
         inherit_from     => [ "darwin64-x86_64-cc", "macos-base" ],
         sys_id           => "MacOSX",
     },
-    # Device (arm64)
     "macos64-arm64" => {
         inherit_from     => [ "darwin64-arm64-cc", "macos-base" ],
         sys_id           => "MacOSX",
     },
-    # Catalyst (x86_64)
+    # Catalyst
     "mac-catalyst-x86_64" => {
         inherit_from      => [ "darwin64-x86_64-cc", "mac-catalyst-base" ],
         cflags            => add("-target x86_64-apple-ios13.0-macabi -mios-version-min=13.0"),
         sys_id            => "MacOSX",
     },
-    # Catalyst (arm64)
     "mac-catalyst-arm64" => {
         inherit_from     => [ "darwin64-arm64-cc", "mac-catalyst-base" ],
         cflags           => add("-target arm64-apple-ios13.0-macabi -mios-version-min=13.0"),
@@ -138,10 +134,16 @@ my %targets = ();
         defines          => [ "HAVE_FORK=0" ],
         sys_id           => "WatchOS",
     },
+    "watchos-sim-cross-i386" => {
+        inherit_from     => [ "darwin-common", "watchos-cross-base"],
+        cflags           => add("-arch i386 -fembed-bitcode"),
+        defines          => [ "HAVE_FORK=0" ],
+        sys_id           => "WatchOS",
+    },
 
     ## Apple TV
 
-    # Device (arm64)
+    # Device
     "tvos64-cross-arm64" => {
         inherit_from     => [ "darwin-common", "tvos-cross-base", asm("aarch64_asm") ],
         cflags           => add("-arch arm64"),
@@ -149,7 +151,7 @@ my %targets = ();
         perlasm_scheme   => "ios64",
         sys_id           => "tvOS",
     },
-    # Simulator (x86_64)
+    # Simulator
     "tvos-sim-cross-x86_64" => {
         inherit_from     => [ "darwin64-x86_64-cc", "tvos-cross-base" ],
         sys_id           => "tvOS",