diff --git a/Tools/XcodeCapp/Jakefile b/Tools/XcodeCapp/Jakefile
new file mode 100644
index 000000000..4ba652305
--- /dev/null
+++ b/Tools/XcodeCapp/Jakefile
@@ -0,0 +1,48 @@
+
+require("../../common.jake");
+
+var OS = require("os"),
+    task = require("jake").task,
+    stream = require("narwhal/term").stream,
+    applicationName = "XcodeCapp.app";
+
+task ("build", function()
+{
+    if (executableExists("xcodebuild"))
+    {
+        var args = "-sdk macosx -alltargets -configuration Release",
+            supportPath = FILE.join($BUILD_CJS_CAPPUCCINO, "support", applicationName),
+            installPath = FILE.join("/", "Applications", applicationName);
+
+        if (OS.system("xcodebuild " + args))
+            OS.exit(1);
+
+        rm_rf(supportPath);
+        FILE.mkdirs(supportPath);
+        cp_r(FILE.join("build", "Release", "XcodeCapp.app"), supportPath);
+        FILE.chmod(FILE.join(supportPath, "Contents", "MacOS", "XcodeCapp"), 0755);
+
+        if (FILE.exists(installPath))
+            FILE.remove(installPath);
+
+        OS.system(["ln", "-s", supportPath, installPath]);
+    }
+    else
+    {
+        print("Building " + applicationName + " requires Xcode.");
+    }
+});
+
+task ("clean", function()
+{
+    if (OS.system("xcodebuild clean"))
+        OS.exit(1);
+});
+
+task ("clobber", function()
+{
+    if (OS.system("xcodebuild clean"))
+        OS.exit(1);
+});
+
+task ("default", ["build"]);
diff --git a/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj b/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj
index 93cbe70aa..e3f7d7cca 100644
--- a/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj
+++ b/Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj
@@ -314,6 +314,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = E164FDF01720E7FA00263CE3 /* Release.xcconfig */;
 			buildSettings = {
+				COPY_PHASE_STRIP = NO;
 			};
 			name = Release;
 		};
diff --git a/Tools/XcodeCapp/XcodeCapp/TNXcodeCapp.m b/Tools/XcodeCapp/XcodeCapp/TNXcodeCapp.m
index 3a21feff6..f7a99d5e4 100644
--- a/Tools/XcodeCapp/XcodeCapp/TNXcodeCapp.m
+++ b/Tools/XcodeCapp/XcodeCapp/TNXcodeCapp.m
@@ -740,7 +740,10 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
     if (pbxArguments)
     {
         DLog(@"%@ Running update PBX task...", NSStringFromSelector(_cmd));
-        NSDictionary *taskResult = [self runTaskWithLaunchPath:self.shellPath arguments:pbxArguments returnType:kTaskReturnTypeStdOut];
+        
+        NSDictionary *taskResult;
+        taskResult = [self runTaskWithLaunchPath:self.shellPath arguments:pbxArguments returnType:kTaskReturnTypeStdOut];
+        
         DLog(@"%@ Update PBX Task result/response: %@/%@", NSStringFromSelector(_cmd), taskResult[@"status"], taskResult[@"response"]);
     }
 
@@ -838,7 +841,10 @@ NSArray *XCCDefaultIgnoredPathRegexes = nil;
                                     projectSourcePath]
                             ];
 
-    NSDictionary *taskResult = [self runTaskWithLaunchPath:self.shellPath arguments:pbxArguments returnType:kTaskReturnTypeStdOut];
+    NSDictionary *taskResult;
+
+    taskResult = [self runTaskWithLaunchPath:self.shellPath arguments:pbxArguments returnType:kTaskReturnTypeStdOut];
+
     DLog(@"%@ PBX Reference removal status/response: %@/%@", NSStringFromSelector(_cmd), taskResult[@"status"], taskResult[@"response"]);
 }