diff --git a/OpenSSL-Apple.podspec b/OpenSSL-Apple.podspec
index c251057..a9023bd 100755
--- a/OpenSSL-Apple.podspec
+++ b/OpenSSL-Apple.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     openssl_version   = "1.1.1h"
-    openssl_targets   = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64"
+    openssl_targets   = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
     script_version    = "6"
 
     s.name            = "OpenSSL-Apple"
diff --git a/OpenSSL-Apple.podspec.template b/OpenSSL-Apple.podspec.template
index 4883428..82b1a3d 100755
--- a/OpenSSL-Apple.podspec.template
+++ b/OpenSSL-Apple.podspec.template
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     openssl_version   = "%OPENSSL-VERSION%"
-    openssl_targets   = "ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64"
+    openssl_targets   = "ios-sim-cross-x86_64 ios-sim-cross-arm64 ios64-cross-arm64 ios64-cross-arm64e macos64-x86_64 macos64-arm64 mac-catalyst-arm64"
     script_version    = "6"
 
     s.name            = "OpenSSL-Apple"
diff --git a/build-libssl.sh b/build-libssl.sh
index 8b2f84d..efce011 100755
--- a/build-libssl.sh
+++ b/build-libssl.sh
@@ -29,9 +29,9 @@ DEFAULTVERSION="1.1.1h"
 
 # Default (=full) set of targets (OpenSSL >= 1.1.1) to build
 DEFAULTTARGETS=`cat <<TARGETS
-ios-sim-cross-x86_64 ios64-cross-arm64 ios64-cross-arm64e
-macos64-x86_64
-mac-catalyst-x86_64
+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
 tvos-sim-cross-x86_64 tvos64-cross-arm64
 TARGETS`
@@ -590,12 +590,21 @@ if [ ${#OPENSSLCONF_ALL[@]} -gt 1 ]; then
       *_ios_sim_x86_64.h)
         DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_X86_64"
       ;;
+      *_ios_sim_arm64.h)
+        DEFINE_CONDITION="TARGET_OS_IOS && TARGET_OS_SIMULATOR && TARGET_CPU_ARM64"
+      ;;
       *_macos_x86_64.h)
         DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_X86_64"
       ;;
+      *_macos_arm64.h)
+        DEFINE_CONDITION="TARGET_OS_OSX && TARGET_CPU_ARM64"
+      ;;
       *_catalyst_x86_64.h)
         DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_X86_64"
       ;;
+      *_catalyst_arm64.h)
+        DEFINE_CONDITION="(TARGET_OS_MACCATALYST || (TARGET_OS_IOS && TARGET_OS_SIMULATOR)) && TARGET_CPU_ARM64"
+      ;;
       *_watchos_armv7k.h)
         DEFINE_CONDITION="TARGET_OS_WATCHOS && TARGET_OS_EMBEDDED && TARGET_CPU_ARMV7K"
       ;;
diff --git a/config/20-all-platforms.conf b/config/20-all-platforms.conf
index af06543..241aa12 100644
--- a/config/20-all-platforms.conf
+++ b/config/20-all-platforms.conf
@@ -66,20 +66,47 @@ my %targets = ();
         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"),
+         sys_id           => "iOS",
+    },
 
     ## Apple macOS
 
+    # Base (arm64)
+    "darwin64-arm64-cc" => {
+        inherit_from     => [ "darwin-common" ],
+        CFLAGS           => add("-Wall"),
+        cflags           => add("-arch arm64"),
+        lib_cppflags     => add("-DL_ENDIAN"),
+        bn_ops           => "SIXTY_FOUR_BIT_LONG",
+        perlasm_scheme   => "macosx",
+     },
+
     # Device (x86_64)
     "macos64-x86_64" => {
         inherit_from     => [ "darwin64-x86_64-cc", "macos-base" ],
         sys_id           => "macOS",
     },
+    # Device (arm64)
+    "macos64-arm64" => {
+         inherit_from     => [ "darwin64-arm64-cc", "macos-base" ],
+         sys_id           => "macOS",
+    },
     # Catalyst (x86_64)
     "mac-catalyst-x86_64" => {
         inherit_from      => [ "darwin64-x86_64-cc", "mac-catalyst-base" ],
         cflags            => add("-target x86_64-apple-ios13.0-macabi"),
         sys_id            => "MacOSX",
     },
+    # Catalyst (arm64)
+    "mac-catalyst-arm64" => {
+         inherit_from     => [ "darwin64-arm64-cc", "mac-catalyst-base" ],
+         cflags           => add("-target arm64-apple-ios13.0-macabi "),
+         sys_id           => "MacOSX",
+    },
 
     ## Apple WatchOS