diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d64b13e2..1c7c48dfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@
   - Implement KDK-less root patching for Metal Intel and Nvidia GPUs
     - AMD GCN will still require a KDK installed for patching
   - Resolve OpenCL support for legacy Metal Intel iGPUs
+  - Implement Automatic Rosetta Cryptex installation on OS installs and updates
+    - Drops need for manual OS.dmg swapping on pre-Haswell
 - Increment Binaries:
   - OpenCorePkg 0.8.3 release
   - Lilu 1.6.2 - release
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index db5b1595f..f04f3fd1e 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1455,6 +1455,24 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>CryptexFixup.kext</string>
+				<key>Comment</key>
+				<string>CryptexFixup</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/CryptexFixup</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 		</array>
 		<key>Block</key>
 		<array/>
diff --git a/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-DEBUG.zip b/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-DEBUG.zip
new file mode 100644
index 000000000..a38b9753b
Binary files /dev/null and b/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-DEBUG.zip differ
diff --git a/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-RELEASE.zip b/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-RELEASE.zip
new file mode 100644
index 000000000..129ea2ab4
Binary files /dev/null and b/payloads/Kexts/Acidanthera/CryptexFixup-v1.0.0-RELEASE.zip differ
diff --git a/resources/build.py b/resources/build.py
index 656f7d045..9ece56a2b 100644
--- a/resources/build.py
+++ b/resources/build.py
@@ -1072,6 +1072,7 @@ class BuildOpenCore:
             # Lets us check in sys_patch.py if config supports FileVault
             self.config["NVRAM"]["Add"]["4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102"]["OCLP-Settings"] += " -allow_fv"
         if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.ivy_bridge.value:
+            self.enable_kext("CryptexFixup.kext", self.constants.cryptexfixup_version, self.constants.cryptexfixup_path)
             print("- Allowing swapped dyld shared cache in Ventura")
             self.get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Disable Root Hash validation")["Enabled"] = True
         if self.constants.disable_msr_power_ctl is True:
diff --git a/resources/constants.py b/resources/constants.py
index 666da98d6..512648b8d 100644
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -45,6 +45,7 @@ class Constants:
         self.bluetool_version = "2.6.3"  #           BlueToolFixup (BrcmPatchRAM)
         self.cslvfixup_version = "2.6.1"  #          CSLVFixup
         self.autopkg_version = "1.0.1"  #            AutoPkgInstaller
+        self.cryptexfixup_version = "1.0.0"  #       CryptexFixup
 
         ## Apple
         ## https://www.apple.com
@@ -412,6 +413,10 @@ class Constants:
     def autopkg_path(self):
         return self.payload_kexts_path / Path(f"Acidanthera/AutoPkgInstaller-v{self.autopkg_version}-{self.kext_variant}.zip")
 
+    @property
+    def cryptexfixup_path(self):
+        return self.payload_kexts_path / Path(f"Acidanthera/CryptexFixup-v{self.cryptexfixup_version}-{self.kext_variant}.zip")
+
     @property
     def innie_path(self):
         return self.payload_kexts_path / Path(f"Misc/Innie-v{self.innie_version}.zip")