Index: main.m
===================================================================
--- main.m	(revision 24201)
+++ main.m	(working copy)
@@ -135,7 +135,8 @@
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     checkMacOSXVersion();
 
-    NSBundle *safariBundle = locateSafariBundle();
+    NSBundle *safariBundle = [NSBundle bundleWithPath:
+        [[NSBundle mainBundle] pathForResource: @"Safari" ofType: @"app"]];
     NSString *executablePath = [safariBundle executablePath];
     NSString *frameworkPath = [[NSBundle mainBundle] resourcePath];
     NSString *pathToEnablerLib = [[NSBundle mainBundle] pathForResource:@"WebKitNightlyEnabler" ofType:@"dylib"];
Index: WebKitLauncher.xcodeproj/project.pbxproj
===================================================================
--- WebKitLauncher.xcodeproj/project.pbxproj	(revision 24201)
+++ WebKitLauncher.xcodeproj/project.pbxproj	(working copy)
@@ -313,6 +311,10 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
Index: WebKitNightlyEnabler.m
===================================================================
--- WebKitNightlyEnabler.m	(revision 24201)
+++ WebKitNightlyEnabler.m	(working copy)
@@ -119,6 +119,22 @@
     unsetenv("WebKitAppPath");
 }
 
+static NSMutableDictionary *combineDicts(NSMutableDictionary *dict, NSDictionary *add) {
+    if (!add) return dict;
+    if (!dict) return [[add mutableCopy] autorelease];
+    [dict addEntriesFromDictionary: add];
+    return dict;
+}
+
+static void addSafari3Prefs() {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    NSMutableDictionary *newdefs = nil;
+    newdefs = combineDicts(newdefs, [defaults persistentDomainForName: @"Safari3"]);
+    newdefs = combineDicts(newdefs, [defaults volatileDomainForName: NSArgumentDomain]);
+    if (newdefs)
+        [defaults setVolatileDomain: newdefs forName: NSArgumentDomain];
+}
+
 static void enableWebKitNightlyBehaviour()
 {
     unsetenv("DYLD_INSERT_LIBRARIES");
@@ -154,6 +170,8 @@
     }
     [userDefaults setInteger:RunStateInitializing forKey:WKNERunState];
     [userDefaults synchronize];
+    
+    addSafari3Prefs();
 
     CFNotificationCenterAddObserver(CFNotificationCenterGetLocalCenter(), &myApplicationWillFinishLaunching,
                                     myApplicationWillFinishLaunching, (CFStringRef) NSApplicationWillFinishLaunchingNotification,