diff --git a/commandline/commands/Setup.hx b/commandline/commands/Setup.hx
index f259f46f..2a1d041b 100644
--- a/commandline/commands/Setup.hx
+++ b/commandline/commands/Setup.hx
@@ -62,6 +62,7 @@ class Setup {
 						type: CMD,
 						data: {
 							inLib: libNode.has.inLib ? libNode.att.inLib : null,
+							dir: libNode.has.dir ? libNode.att.dir : null,
 							lines: {
 								if(Lambda.count(libNode.nodes.line) > 0)
 								[
@@ -141,9 +142,13 @@ class Setup {
 							prettyPrint('Cannot resolve library of type "${lib.type}"');
 					}
 				case CMD:
-					final cmd:CmdData = event.data;
-					final lib = cmd.inLib;
-					final oldCwd = Sys.getCwd();
+					var cmd:CmdData = event.data;
+					var lib = cmd.inLib;
+					var dir = "";
+					if(cmd.dir != null) {
+						dir = "/" + cmd.dir;
+					}
+					var oldCwd = Sys.getCwd();
 					if(lib != null) {
 						final libPrefix = '.haxelib/$lib';
 						if(FileSystem.exists(libPrefix)) {
@@ -154,7 +159,7 @@ class Setup {
 									Sys.setCwd(oldCwd);
 									continue;
 								}
-								Sys.setCwd(devPath);
+								Sys.setCwd(devPath + dir);
 							} else if(FileSystem.exists(libPrefix + '/.current')) {
 								final version = StringTools.replace(File.getContent(libPrefix + '/.current'), ".", ",");
 								if(!FileSystem.exists(libPrefix + '/$version')) {
@@ -162,7 +167,7 @@ class Setup {
 									Sys.setCwd(oldCwd);
 									continue;
 								}
-								Sys.setCwd(libPrefix + '/$version');
+								Sys.setCwd(libPrefix + '/$version' + dir);
 							} else {
 								Sys.println('Cannot find .dev or .current file in $libPrefix');
 								Sys.setCwd(oldCwd);
@@ -271,7 +276,8 @@ typedef Event = {
 }
 
 typedef CmdData = {
-	var ?inLib:String;
+	var inLib:String;
+	var dir:String;
 	var lines:Array<String>;
 }
 
diff --git a/libs.xml b/libs.xml
index 3e3e7b56..e62e7c0d 100644
--- a/libs.xml
+++ b/libs.xml
@@ -34,10 +34,6 @@
 
 		<!-- Build lime -->
 		<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
-		<cmd inLib="lime" >
-			<line>cd tools</line>
-			<line>haxe tools.hxml</line>
-			<line>cd ..</line>
-		</cmd>
+		<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
 	</if>
 </libraries>
diff --git a/setup-dev-branch.xml b/setup-dev-branch.xml
index b940c5c2..992a440f 100644
--- a/setup-dev-branch.xml
+++ b/setup-dev-branch.xml
@@ -22,9 +22,5 @@
 
 	<print pretty="true">Rebuilding Lime...</print>
 	<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
-	<cmd inLib="lime" >
-		<line>cd tools</line>
-		<line>haxe tools.hxml</line>
-		<line>cd ..</line>s
-	</cmd>
+	<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
 </libraries>
diff --git a/setup-dev.xml b/setup-dev.xml
index 010bee50..a6559cdb 100644
--- a/setup-dev.xml
+++ b/setup-dev.xml
@@ -25,11 +25,7 @@
 
 		<!-- Build lime -->
 		<cmd inLib="lime" cmd="haxelib run lime rebuild . $PLATFORM -clean" />
-		<cmd inLib="lime" >
-			<line>cd tools</line>
-			<line>haxe tools.hxml</line>
-			<line>cd ..</line>s
-		</cmd>
+		<cmd inLib="lime" dir="tools" cmd="haxe tools.hxml" />
 	</if>
 
 	<if cond="flixel || all">