diff --git a/src/compiler/watcom.js b/src/compiler/watcom.js
index d00d268..4a62dc4 100644
--- a/src/compiler/watcom.js
+++ b/src/compiler/watcom.js
@@ -7,8 +7,6 @@ Watcom.description = "Open Watcom";
 Watcom.output = function(target) {
 	if(target instanceof pmake.LibraryProject) {
 		return target.output + ".lib";
-	} else if(target instanceof pmake.ExecutableProject) {
-		return target.output + ".exe";
 	}
 
 	return pmake.Compiler.prototype.output.call(this, target);
diff --git a/src/js/core.js b/src/js/core.js
index 4cca0c3..ed5269e 100644
--- a/src/js/core.js
+++ b/src/js/core.js
@@ -193,7 +193,11 @@ Compiler.prototype.output = function(target) {
 	} else if(target instanceof pmake.LibraryProject) {
 		return "lib" + target.output + ".a";
 	} else if(target instanceof pmake.ExecutableProject) {
-		return target.output;
+		if(pmake.system.target == "Windows"){
+			return target.output + ".exe";
+		}else{
+			return target.output;
+		}
 	}
 
 	return target.output;