diff --git a/.gitignore b/.gitignore
index 8f9beea..5bc5219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 
 # Created by https://www.gitignore.io/api/linux,macos,windows,visualstudio,visualstudiocode
 
+# Clover specific
+Build_Clover.command
+
 ### Linux ###
 *~
 
diff --git a/.scripts/build.sh b/.scripts/build.sh
index c16fcd9..45c6106 100755
--- a/.scripts/build.sh
+++ b/.scripts/build.sh
@@ -1,12 +1,47 @@
 #!/bin/bash
 
+# Setup error handling
 set -e
 set -o pipefail
 
+# Enable debugging
+set -x
+
+# Append myself to the credits
+CREDITS_ORIGINAL="Chameleon team, crazybirdy, JrCs."
+CREDITS_MODIFIED="Chameleon team, crazybirdy, JrCs, Dids."
+sed -i '' -e "s/.*${CREDITS_ORIGINAL}.*/${CREDITS_MODIFIED}/" "${HOME}/src/edk2/Clover/CloverPackage/CREDITS"
+
 # Build Clover and create the initial package
 "${TRAVIS_BUILD_DIR}/Build_Clover.command"
 
-# Create a patched apfs.efi
+## TODO: This step can be removed if/when Build_Clover
+##       or Clover itself gets official AptioFix support
+
+# Build and install the AptioFix (U)EFI drivers by vit9696
+# (thanks to fusion71au from InsanelyMac for the build steps)
+cd "${HOME}/src/edk2"
+rm -fr \
+    AptioFixPkg \
+    CupertinoModulePkg \
+    EfiMiscPkg \
+    EfiPkg \
+    2> /dev/null
+git clone https://github.com/vit9696/AptioFixPkg.git
+git clone https://github.com/CupertinoNet/CupertinoModulePkg
+git clone https://github.com/CupertinoNet/EfiMiscPkg
+git clone https://github.com/CupertinoNet/EfiPkg
+export NASM_PREFIX="${HOME}/src/opt/local/bin/"
+source edksetup.sh
+make -C BaseTools
+touch edk2.ready
+build -a X64 -b RELEASE -t XCODE5 -p AptioFixPkg/AptioFixPkg.dsc
+
+# Install the AptioFix (U)EFI drivers
+cd "${HOME}/src/edk2/Clover/CloverPackage/CloverV2/drivers-Off"
+cp -f ${HOME}/src/edk2/Build/AptioFixPkg/RELEASE_XCODE5/X64/*.efi drivers64UEFI/
+
+# Create patched APFS EFI drivers
 cd "${HOME}/src/edk2/Clover/CloverPackage/CloverV2/drivers-Off"
 cp -f drivers64/apfs-64.efi drivers64/apfs_patched-64.efi
 cp -f drivers64UEFI/apfs.efi drivers64UEFI/apfs_patched.efi
@@ -21,6 +56,8 @@ echo '"Fat-64_description" = "Adds support for exFAT (FAT64) partitions.";' >> L
 echo '"NTFS_description" = "Adds support for NTFS partitions.";' >> Localizable.strings
 echo '"apfs_description" = "Adds support for APFS partitions.";' >> Localizable.strings
 echo '"apfs_patched_description" = "Adds support for APFS partitions.\nPatched version which removes verbose logging on startup.\n\nWARNING: Do NOT enable multiple apfs.efi drivers!";' >> Localizable.strings
+echo '"AptioMemoryFix_description" = "Fork of the original OsxAptioFix2 driver with a cleaner (yet still terrible) codebase and improved stability and functionality.\n\nWARNING: Do NOT use in combination with older AptioFix drivers.\nThis is an experimental driver by vit9696 (https://github.com/vit9696/AptioFixPkg).";' >> Localizable.strings
+echo '"AptioInputFix_description" = "Reference driver to shim AMI APTIO proprietary mouse & keyboard protocols for File Vault 2 GUI input support.\n\nWARNING: Do NOT use in combination with older AptioFix drivers.\nThis is an experimental driver by vit9696 (https://github.com/vit9696/AptioFixPkg).";' >> Localizable.strings
 
 # Recreate the package
 cd "${HOME}/src/edk2/Clover/CloverPackage"
diff --git a/BuildCloverConfig.txt b/BuildCloverConfig.txt
index 7e2156c..4dcf544 100644
--- a/BuildCloverConfig.txt
+++ b/BuildCloverConfig.txt
@@ -20,3 +20,4 @@ INTERACTIVE=NO
 ForceEDK2Update=0
 ARCH=X64
 FORCEREBUILD=-fr
+SHOWCCP_ADVERTISE=YES