diff --git a/build.xml b/build.xml
index b0437c070..8c75886f1 100644
--- a/build.xml
+++ b/build.xml
@@ -55,9 +55,6 @@
         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
     </target>
     <target name="buildexe">
-        <condition property="noExe">
-	    <os family="mac" />
-	</condition>
         <condition property="noExe">
 	    <os arch="x86_64" />
 	</condition>
@@ -67,6 +64,14 @@
         <condition property="noExe">
 	    <os arch="amd64" />
 	</condition>
+	<condition property="noExe">
+	   <not>
+	    <or>
+	     <os name="Linux" />
+	     <os family="windows" />
+	    </or>
+	   </not>
+	</condition>
 	<ant target="doBuildEXE" />
     </target>
     <target name="doBuildEXE" unless="noExe">
@@ -396,15 +401,20 @@
         <ant target="installerexe" />
     </target>
     <target name="installerexe">
-        <condition property="noExe">
-	    <os family="mac" />
-	</condition>
         <condition property="noExe">
 	    <os arch="x86_64" />
 	</condition>
         <condition property="noExe">
 	    <os arch="amd64" />
 	</condition>
+	<condition property="noExe">
+	   <not>
+	    <or>
+	     <os name="Linux" />
+	     <os family="windows" />
+	    </or>
+	   </not>
+	</condition>
 	<ant target="doInstallerEXE" />
     </target>
     <target name="doInstallerEXE" unless="noExe">