diff --git a/src/MacVim/English.lproj/Preferences.nib/classes.nib b/src/MacVim/English.lproj/Preferences.nib/classes.nib
index 60b1524025..fbdbe5193b 100644
--- a/src/MacVim/English.lproj/Preferences.nib/classes.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/classes.nib
@@ -74,6 +74,8 @@
 		<dict>
 			<key>ACTIONS</key>
 			<dict>
+				<key>atsuiButtonClicked</key>
+				<string>id</string>
 				<key>loginShellButtonClicked</key>
 				<string>id</string>
 				<key>quickstartButtonClicked</key>
diff --git a/src/MacVim/English.lproj/Preferences.nib/info.nib b/src/MacVim/English.lproj/Preferences.nib/info.nib
index dda7819870..9c4b5d95c6 100644
--- a/src/MacVim/English.lproj/Preferences.nib/info.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/info.nib
@@ -10,7 +10,7 @@
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>620</integer>
+		<integer>115</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9E17</string>
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index 73798532d3..2729ceab3b 100644
Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ
diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m
index 63e3bec827..d6fdaf8dab 100644
--- a/src/MacVim/MMAppController.m
+++ b/src/MacVim/MMAppController.m
@@ -117,6 +117,7 @@ static int executeInLoginShell(NSString *path, NSArray *args);
 - (int)maxPreloadCacheSize;
 - (MMVimController *)takeVimControllerFromCache;
 - (void)clearPreloadCacheWithCount:(int)count;
+- (void)rebuildPreloadCache;
 - (NSDate *)rcFilesModificationDate;
 - (BOOL)openVimControllerWithArguments:(NSDictionary *)arguments;
 - (void)activateWhenNextWindowOpens;
@@ -165,7 +166,7 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         [NSNumber numberWithBool:YES],  MMTranslateCtrlClickKey,
         [NSNumber numberWithInt:0],     MMOpenInCurrentWindowKey,
         [NSNumber numberWithBool:NO],   MMNoFontSubstitutionKey,
-        [NSNumber numberWithBool:NO],   MMLoginShellKey,
+        [NSNumber numberWithBool:YES],  MMLoginShellKey,
         [NSNumber numberWithBool:NO],   MMAtsuiRendererKey,
         [NSNumber numberWithInt:MMUntitledWindowAlways],
                                         MMUntitledWindowKey,
@@ -964,15 +965,18 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
     [NSApp makeWindowsPerform:@selector(performZoom:) inOrder:YES];
 }
 
+- (IBAction)atsuiButtonClicked:(id)sender
+{
+    // This action is called when the user clicks the "use ATSUI renderer"
+    // button in the advanced preferences pane.
+    [self rebuildPreloadCache];
+}
+
 - (IBAction)loginShellButtonClicked:(id)sender
 {
     // This action is called when the user clicks the "use login shell" button
-    // in the general preferences pane.
-    if ([self maxPreloadCacheSize] > 0) {
-        [self clearPreloadCacheWithCount:-1];
-        [self cancelVimControllerPreloadRequests];
-        [self scheduleVimControllerPreloadAfterDelay:1.0];
-    }
+    // in the advanced preferences pane.
+    [self rebuildPreloadCache];
 }
 
 - (IBAction)quickstartButtonClicked:(id)sender
@@ -1559,6 +1563,15 @@ fsEventCallback(ConstFSEventStreamRef streamRef,
         [cachedVimControllers removeObjectAtIndex:0];
 }
 
+- (void)rebuildPreloadCache
+{
+    if ([self maxPreloadCacheSize] > 0) {
+        [self clearPreloadCacheWithCount:-1];
+        [self cancelVimControllerPreloadRequests];
+        [self scheduleVimControllerPreloadAfterDelay:1.0];
+    }
+}
+
 - (NSDate *)rcFilesModificationDate
 {
     // Check modification dates for ~/.vimrc and ~/.gvimrc and return the