diff --git a/src/MacVim/English.lproj/MainMenu.nib/info.nib b/src/MacVim/English.lproj/MainMenu.nib/info.nib
index 4e41f05cd3..2eb7c53534 100644
--- a/src/MacVim/English.lproj/MainMenu.nib/info.nib
+++ b/src/MacVim/English.lproj/MainMenu.nib/info.nib
@@ -9,7 +9,9 @@
 	<key>IBOldestOS</key>
 	<integer>5</integer>
 	<key>IBOpenObjects</key>
-	<array/>
+	<array>
+		<integer>29</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>9D34</string>
 	<key>targetFramework</key>
diff --git a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib
index 85b21c55df..8493db8c70 100644
Binary files a/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib and b/src/MacVim/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m
index 4072d63930..2b2a697672 100644
--- a/src/MacVim/MMAtsuiTextView.m
+++ b/src/MacVim/MMAtsuiTextView.m
@@ -426,10 +426,14 @@ enum {
         return YES;
     }
 
+    // HACK!  Don't handle Cmd-? or the "Help" menu does not work on Leopard.
+    NSString *unmodchars = [event charactersIgnoringModifiers];
+    if ([unmodchars isEqual:@"?"])
+        return NO;
+
     //NSLog(@"%s%@", _cmd, event);
 
     NSString *chars = [event characters];
-    NSString *unmodchars = [event charactersIgnoringModifiers];
     int len = [unmodchars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
     NSMutableData *data = [NSMutableData data];
 
diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m
index 965443efb8..a3964d12fa 100644
--- a/src/MacVim/MMTextView.m
+++ b/src/MacVim/MMTextView.m
@@ -684,10 +684,14 @@ enum {
         return YES;
     }
 
+    // HACK!  Don't handle Cmd-? or the "Help" menu does not work on Leopard.
+    NSString *unmodchars = [event charactersIgnoringModifiers];
+    if ([unmodchars isEqual:@"?"])
+        return NO;
+
     //NSLog(@"%s%@", _cmd, event);
 
     NSString *chars = [event characters];
-    NSString *unmodchars = [event charactersIgnoringModifiers];
     int len = [unmodchars lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
     NSMutableData *data = [NSMutableData data];
 
diff --git a/src/MacVim/gvimrc b/src/MacVim/gvimrc
index a735ff310f..b428549b0b 100644
--- a/src/MacVim/gvimrc
+++ b/src/MacVim/gvimrc
@@ -246,6 +246,7 @@ macm Window.Previous\ Tab               key=<D-{>
 macm Window.Next\ Tab                   key=<D-}>
 macm Window.Bring\ All\ To\ Front       action=arrangeInFront:
 
+macm Help.MacVim\ Help                  key=<D-?>
 macm Help.MacVim\ Website               action=openWebsite:
 
 " Restore the previous value of 'cpoptions'.