diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
index aff6bfe7..ceb924a9 100644
--- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
+++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj
@@ -1364,7 +1364,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII;
@@ -1414,7 +1414,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII;
diff --git a/BasiliskII/src/MacOSX/utils_macosx.mm b/BasiliskII/src/MacOSX/utils_macosx.mm
index e5683341..b69e4cda 100644
--- a/BasiliskII/src/MacOSX/utils_macosx.mm
+++ b/BasiliskII/src/MacOSX/utils_macosx.mm
@@ -19,6 +19,7 @@
  */
 
 #include <Cocoa/Cocoa.h>
+#include "sysdeps.h"
 #include "utils_macosx.h"
 #include <SDL.h>
 
@@ -38,6 +39,13 @@ void disable_SDL2_macosx_menu_bar_keyboard_shortcuts() {
 	for (NSMenuItem * menu_item in [NSApp mainMenu].itemArray) {
 		if (menu_item.hasSubmenu) {
 			for (NSMenuItem * sub_item in menu_item.submenu.itemArray) {
+#ifdef SHEEPSHAVER
+				if ([sub_item.title isEqualToString:@"Preferences…"]) {
+					extern id gSheepShaverMain;
+					sub_item.target = gSheepShaverMain;
+					sub_item.action = @selector(openPreferences:);
+				}
+#endif
 				sub_item.keyEquivalent = @"";
 				sub_item.keyEquivalentModifierMask = 0;
 			}
diff --git a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
index 141ab10f..8ce5bbab 100755
--- a/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
+++ b/SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
@@ -1345,7 +1345,7 @@
 				INFOPLIST_PREFIX_HEADER = "";
 				INFOPLIST_PREPROCESS = NO;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
@@ -1403,7 +1403,7 @@
 				INFOPLIST_PREFIX_HEADER = "";
 				INFOPLIST_PREPROCESS = NO;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
diff --git a/SheepShaver/src/MacOSX/prefs_macosx.mm b/SheepShaver/src/MacOSX/prefs_macosx.mm
index e8b77924..3524e48b 100644
--- a/SheepShaver/src/MacOSX/prefs_macosx.mm
+++ b/SheepShaver/src/MacOSX/prefs_macosx.mm
@@ -30,6 +30,7 @@
 #include <Cocoa/Cocoa.h>
 #include "VMSettingsController.h"
 
+#include <SDL.h>
 
 @interface SheepShaverMain : NSObject
 {
@@ -96,12 +97,28 @@
 	[pool release];
 }
 
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+	return YES;
+}
+
 @end
 
 /*
  *  Initialization
  */
 
+#if SDL_VERSION_ATLEAST(2,0,0)
+
+id gSheepShaverMain;
+
+void prefs_init(void)
+{
+	gSheepShaverMain = [[SheepShaverMain alloc] init];
+}
+
+#else
+
 void prefs_init(void)
 {
 	NSAutoreleasePool *pool;
@@ -121,6 +138,7 @@ void prefs_init(void)
 	[pool release];
 }
 
+#endif
 
 /*
  *  Deinitialization