diff --git a/tools/CommandLineTools.hx b/tools/CommandLineTools.hx
index 92ceacf94..fdaee3700 100644
--- a/tools/CommandLineTools.hx
+++ b/tools/CommandLineTools.hx
@@ -136,7 +136,15 @@ class CommandLineTools {
 				
 				if (words.length < 2) {
 					
-					words.unshift ("lime");
+					if (targetFlags.exists ("openfl")) {
+						
+						words.unshift ("openfl");
+						
+					} else {
+						
+						words.unshift ("lime");
+						
+					}
 					
 				}
 				
@@ -252,6 +260,10 @@ class CommandLineTools {
 							project = new HXProject ();
 							project.config.set ("project.rebuild.path", PathHelper.combine (PathHelper.getHaxelib (haxelib), "project"));
 							
+						} else {
+							
+							project.config.set ("project.rebuild.path", PathHelper.combine (PathHelper.getHaxelib (haxelib), project.config.get ("project.rebuild.path")));
+							
 						}
 						
 					} else {