diff --git a/uppsrc/ide/Builders/MakeFile.cpp b/uppsrc/ide/Builders/MakeFile.cpp
index 1a4f6040f..0eabc0243 100644
--- a/uppsrc/ide/Builders/MakeFile.cpp
+++ b/uppsrc/ide/Builders/MakeFile.cpp
@@ -344,6 +344,8 @@ void MakeBuild::SaveMakeFile(const String& fn, bool exporting)
 				output = wspc[i] + ".out";
 			else
 				output = "./" + wspc[0];
+			while(DirectoryExists(output))
+				output << ".out";
 			StringStream ss;
 			String svn_info;
 			String build_info = "\"$(UPPOUT)/build_info.h\"";
diff --git a/uppsrc/umk/umake.cpp b/uppsrc/umk/umake.cpp
index 4aabdb26f..68d8563d7 100644
--- a/uppsrc/umk/umake.cpp
+++ b/uppsrc/umk/umake.cpp
@@ -163,6 +163,7 @@ CONSOLE_APP_MAIN
 		bool deletedir = true;
 		int  exporting = 0;
 		String mkf;
+
 		for(int i = 3; i < arg.GetCount(); i++)
 			if(arg[i][0] == '+' || arg[i][0] == '>')
 				ide.mainconfigparam = Filter(~arg[i] + 1, CommaSpace);
@@ -230,6 +231,7 @@ CONSOLE_APP_MAIN
 				ide.debug.target = ide.release.target = NormalizePath(arg[i]);
 				PutVerbose("Target override: " << ide.debug.target);
 			}
+
 		if(clean)
 			ide.Clean();
 		if(exporting) {