diff --git a/MacVim.xcodeproj/project.pbxproj b/MacVim.xcodeproj/project.pbxproj
index f4d3b16df5..11f241cae1 100644
--- a/MacVim.xcodeproj/project.pbxproj
+++ b/MacVim.xcodeproj/project.pbxproj
@@ -521,41 +521,6 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
-		1DF7D93A0BC05175006CF13F /* My Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(NATIVE_ARCH)";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_3)",
-				);
-				FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/../../../../Library/Frameworks\"";
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				HEADER_SEARCH_PATHS = PSMTabBarControl/source/;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = MacVim;
-				WRAPPER_EXTENSION = app;
-			};
-			name = "My Release";
-		};
-		1DF7D93B0BC05175006CF13F /* My Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-			};
-			name = "My Release";
-		};
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -578,7 +543,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = MacVim;
 				WRAPPER_EXTENSION = app;
-				ZERO_LINK = YES;
+				ZERO_LINK = NO;
 			};
 			name = Debug;
 		};
@@ -604,6 +569,7 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = MacVim;
 				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
 			};
 			name = Release;
 		};
@@ -635,7 +601,6 @@
 			buildConfigurations = (
 				C01FCF4B08A954540054247B /* Debug */,
 				C01FCF4C08A954540054247B /* Release */,
-				1DF7D93A0BC05175006CF13F /* My Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -645,7 +610,6 @@
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
 				C01FCF5008A954540054247B /* Release */,
-				1DF7D93B0BC05175006CF13F /* My Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/MacVim.xcodeproj/winckler.mode1 b/MacVim.xcodeproj/winckler.mode1
index 83c74852cf..df318deb0e 100644
--- a/MacVim.xcodeproj/winckler.mode1
+++ b/MacVim.xcodeproj/winckler.mode1
@@ -368,9 +368,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>1DDBEB8A0C7438DA0036EEDD</string>
+				<string>1DE5E6960C75770B0027A2B1</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1DDBEB8B0C7438DA0036EEDD</string>
+				<string>1DE5E6970C75770B0027A2B1</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -504,13 +504,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>1DDBEBA70C743B2A0036EEDD</string>
-		<string>1DDBEBA80C743B2A0036EEDD</string>
-		<string>1DE444730BA4445100C4C77A</string>
-		<string>1CD10A99069EF8BA00B06720</string>
-		<string>1DDBEBA50C743B2A0036EEDD</string>
-		<string>1D16B9EF0BA33E3800A69B33</string>
-		<string>1C0AD2B3069F1EA900FABCE6</string>
 		<string>/Users/winckler/Projects/vim7/src/MacVim/MacVim.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
diff --git a/MacVim.xcodeproj/winckler.pbxuser b/MacVim.xcodeproj/winckler.pbxuser
index 908cd852a8..cee65d47b5 100644
--- a/MacVim.xcodeproj/winckler.pbxuser
+++ b/MacVim.xcodeproj/winckler.pbxuser
@@ -392,8 +392,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 208941697;
-			PBXWorkspaceStateSaveDate = 208941697;
+			PBXPerProjectTemplateStateSaveDate = 209024719;
+			PBXWorkspaceStateSaveDate = 209024719;
 		};
 		sourceControlManager = 1D16B9DD0BA33BB000A69B33 /* Source Control */;
 		userBuildSettings = {