diff --git a/run.n b/run.n
index 586928543..c4e24afeb 100644
Binary files a/run.n and b/run.n differ
diff --git a/tools/RunScript.hx b/tools/RunScript.hx
index ccfd51854..0dca9fd90 100644
--- a/tools/RunScript.hx
+++ b/tools/RunScript.hx
@@ -164,6 +164,7 @@ class RunScript {
 		if (args.length > 2 && args[0] == "rebuild" && args[1] == "tools") {
 			
 			var lastArgument = new Path (args[args.length - 1]).toString ();
+			var cacheDirectory = Sys.getCwd ();
 			
 			if (((StringTools.endsWith (lastArgument, "/") && lastArgument != "/") || StringTools.endsWith (lastArgument, "\\")) && !StringTools.endsWith (lastArgument, ":\\")) {
 				
@@ -226,6 +227,10 @@ class RunScript {
 				
 				Sys.exit (0);
 				
+			} else {
+				
+				Sys.setCwd (cacheDirectory);
+				
 			}
 			
 		}