diff --git a/setup/macos-live/El Capitan/Utilities.plist b/setup/macos-live/El Capitan/Utilities.plist
new file mode 100644
index 00000000..89304181
--- /dev/null
+++ b/setup/macos-live/El Capitan/Utilities.plist	
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Buttons</key>
+	<array>
+		<dict>
+			<key>BundlePath</key>
+			<string>/Applications/iTerm.app</string>
+			<key>DescriptionKey</key>
+			<string>Hardware Diagnostics</string>
+			<key>Path</key>
+			<string>/Applications/iTerm.app/Contents/MacOS/iTerm2</string>
+			<key>TitleKey</key>
+			<string>WizardKit: Hardware Diagnostics</string>
+		</dict>
+		<dict>
+			<key>BundlePath</key>
+			<string>/Applications/Utilities/Disk Utility.app</string>
+			<key>DescriptionKey</key>
+			<string>Repair or erase a volume.</string>
+			<key>Path</key>
+			<string>/Applications/Utilities/Disk Utility.app/Contents/MacOS/Disk Utility</string>
+			<key>TitleKey</key>
+			<string>Disk Utility</string>
+		</dict>
+	</array>
+	<key>Menu</key>
+	<array>
+		<dict>
+			<key>BundlePath</key>
+			<string>/Applications/Utilities/Firmware Password Utility.app</string>
+			<key>Path</key>
+			<string>/Applications/Utilities/Firmware Password Utility.app/Contents/MacOS/Firmware Password Utility</string>
+			<key>TitleKey</key>
+			<string>Firmware Password Utility</string>
+		</dict>
+		<dict>
+			<key>BundlePath</key>
+			<string>/System/Library/CoreServices/Applications/Network Utility.app</string>
+			<key>Path</key>
+			<string>/System/Library/CoreServices/Applications/Network Utility.app/Contents/MacOS/Network Utility</string>
+			<key>TitleKey</key>
+			<string>Network Utility</string>
+		</dict>
+		<dict>
+			<key>BundlePath</key>
+			<string>/System/Library/CoreServices/Applications/RAID Utility.app</string>
+			<key>Path</key>
+			<string>/System/Library/CoreServices/Applications/RAID Utility.app/Contents/MacOS/RAID Utility</string>
+			<key>Show If</key>
+			<dict>
+				<key>Selector</key>
+				<string>shouldShowRAIDUtility</string>
+			</dict>
+			<key>TitleKey</key>
+			<string>RAID Utility</string>
+		</dict>
+		<dict>
+			<key>BundlePath</key>
+			<string>/Applications/Utilities/Terminal.app</string>
+			<key>Path</key>
+			<string>/Applications/Utilities/Terminal.app/Contents/MacOS/Terminal</string>
+			<key>TitleKey</key>
+			<string>Terminal</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/setup/macos-live/Utilities.plist b/setup/macos-live/Utilities.plist
index 89304181..6d492017 100644
--- a/setup/macos-live/Utilities.plist
+++ b/setup/macos-live/Utilities.plist
@@ -6,11 +6,11 @@
 	<array>
 		<dict>
 			<key>BundlePath</key>
-			<string>/Applications/iTerm.app</string>
+			<string>/Applications/iTerm-2.app</string>
 			<key>DescriptionKey</key>
 			<string>Hardware Diagnostics</string>
 			<key>Path</key>
-			<string>/Applications/iTerm.app/Contents/MacOS/iTerm2</string>
+			<string>/Applications/iTerm-2.app/Contents/MacOS/iTerm2</string>
 			<key>TitleKey</key>
 			<string>WizardKit: Hardware Diagnostics</string>
 		</dict>
diff --git a/setup/macos-live/update-base-image b/setup/macos-live/update-base-image
index 59dc387e..eeb505cb 100755
--- a/setup/macos-live/update-base-image
+++ b/setup/macos-live/update-base-image
@@ -29,7 +29,11 @@ rm -R "${WK_PATH}"/Install*.app
 
 # Update Utilities menu
 echo "Updating Utilities menu..."
-cp -a Utilities.plist "${WK_PATH}/System/Installation/CDIS/macOS Utilities.app/Contents/Resources/Utilities.plist"
+if [[ "${OS_VERSION}" == "El Capitan" ]]; then
+  cp -a "El Capitan/Utilities.plist" "${WK_PATH}/System/Installation/CDIS/macOS Utilities.app/Contents/Resources/Utilities.plist"
+else
+  cp -a Utilities.plist "${WK_PATH}/System/Installation/CDIS/macOS Utilities.app/Contents/Resources/Utilities.plist"
+fi
 
 # 1201 CA
 echo "Installing 1201 CA..."
@@ -48,8 +52,14 @@ cp -a /Library/Fonts/Inconsolata*ttf "${WK_PATH}/System/Library/Fonts"/
 
 # iTerm2
 echo "Installing iTerm2..."
+if [[ "${OS_VERSION}" == "El Capitan" ]]; then
+  rsync -aS /Applications/iTerm.app "${WK_PATH}/Applications"/
+else
+  rsync -aS /Applications/iTerm-2.app "${WK_PATH}/Applications"/
+  rsync -aS /usr/lib/lib{apr,expat,ffi}* /Volumes/1201_UFD/usr/lib/
+  rsync -aS /System/Library/Frameworks/{MetalKit,Quartz*}.framework "${WK_PATH}/System/Library/Frameworks"/
+fi
 cp -a ../linux/include/airootfs/etc/skel/.tmux.conf "${WK_PATH}/etc/tmux.conf"
-rsync -aS /Applications/iTerm.app "${WK_PATH}/Applications"/
 rsync -aS /System/Library/Colors/System.clr "${WK_PATH}/System/Library/Colors"/
 rsync -aS /System/Library/Frameworks/{Scripting,ScriptingBridge,LocalAuthentication}.framework "${WK_PATH}/System/Library/Frameworks"/
 rsync -aS /usr/bin/locale "${WK_PATH}/usr/bin"/