diff --git a/Applications/TextMate/default.rave b/Applications/TextMate/default.rave
index ec141512..89d428ab 100644
--- a/Applications/TextMate/default.rave
+++ b/Applications/TextMate/default.rave
@@ -23,7 +23,8 @@ target "${dirname}" {
 
 	prefix "${target}.app/Contents"
 
-	files resources/* icons/*.icns @PrivilegedTool @mate @tm_query "Resources"
+	files resources/* icons/*.icns @PrivilegedTool "Resources"
+	files @mate @tm_query    "MacOS"
 	files about/*            "Resources/About"
 	files Info.plist         "."
 	copy  support/*          "SharedSupport"
diff --git a/Applications/TextMate/resources/Default.tmProperties b/Applications/TextMate/resources/Default.tmProperties
index ed433a3c..1db47d05 100644
--- a/Applications/TextMate/resources/Default.tmProperties
+++ b/Applications/TextMate/resources/Default.tmProperties
@@ -12,10 +12,10 @@ windowTitle        = '$TM_DISPLAYNAME$windowTitleProject$windowTitleSCM'
 LANG                 = "en_US.UTF-8"
 LC_CTYPE             = "en_US.UTF-8"
 TM_APP_PATH          = "${CWD/\/Contents\/Resources$//}"
-TM_MATE              = "$CWD/mate"
+TM_MATE              = "${TM_APP_PATH}/Contents/MacOS/mate"
 MATEFLAGS            = "--no-recent"
-TM_QUERY             = "$CWD/tm_query"
-TM_SCM_COMMIT_WINDOW = "$CWD/CommitWindowTool"
+TM_QUERY             = "${TM_APP_PATH}/Contents/MacOS/tm_query"
+TM_SCM_COMMIT_WINDOW = "${TM_APP_PATH}/Contents/MacOS/CommitWindowTool"
 
 [ attr.untitled ]
 fileType         = text.plain
diff --git a/Frameworks/CommitWindow/default.rave b/Frameworks/CommitWindow/default.rave
index acc13f2f..fc29c1f0 100644
--- a/Frameworks/CommitWindow/default.rave
+++ b/Frameworks/CommitWindow/default.rave
@@ -2,7 +2,7 @@ target "${dirname}" {
 	require OakAppKit OakFoundation OakTextView bundles document io ns plist regexp text
 	headers src/CommitWindow.h
 	sources src/*.mm
-	files @CommitWindowTool "Resources"
+	files @CommitWindowTool "MacOS"
 	frameworks Cocoa
 }
 
diff --git a/Frameworks/Preferences/src/TerminalPreferences.mm b/Frameworks/Preferences/src/TerminalPreferences.mm
index e0c9aadf..fd026010 100644
--- a/Frameworks/Preferences/src/TerminalPreferences.mm
+++ b/Frameworks/Preferences/src/TerminalPreferences.mm
@@ -261,7 +261,7 @@ static bool uninstall_mate (std::string const& path)
 
 - (void)installMateAs:(NSString*)dstPath
 {
-	if(NSString* srcPath = [[NSBundle mainBundle] pathForResource:@"mate" ofType:nil])
+	if(NSString* srcPath = [NSBundle.mainBundle pathForAuxiliaryExecutable:@"mate"])
 	{
 		if(install_mate(to_s(srcPath), to_s(dstPath)))
 		{
@@ -328,7 +328,7 @@ static bool uninstall_mate (std::string const& path)
 {
 	NSString* oldMate    = [[NSUserDefaults.standardUserDefaults stringForKey:kUserDefaultsMateInstallPathKey] stringByExpandingTildeInPath];
 	NSString* oldVersion = [NSUserDefaults.standardUserDefaults stringForKey:kUserDefaultsMateInstallVersionKey];
-	NSString* newMate    = [[NSBundle mainBundle] pathForResource:@"mate" ofType:nil];
+	NSString* newMate    = [NSBundle.mainBundle pathForAuxiliaryExecutable:@"mate"];
 
 	if(oldMate && newMate)
 	{