--- setup.xml.org	2006-10-19 14:27:49.000000000 +0200
+++ setup.xml	2006-11-12 19:57:05.691174912 +0100
@@ -379,25 +379,60 @@
 
 </target> 
 
-<target name="do.chmod" depends="do.chmod.unix, do.chmod.linux"/>
+<target name="do.chmod" depends="do.chmod.unix"/>
 
 <target name="do.chmod.unix" depends="setup.init">
+    <!-- all the executable GlassFish/bin executable files -->
     <chmod perm="ugo+x">
-        <fileset dir="${install.home}/imq/bin"/>
-        <fileset dir="${install.home}/bin"/>
-        <fileset dir="${install.home}/lib"/>
+	<fileset dir="${install.home}/bin"/>
+    </chmod>
+    <!-- all the GlassFish/lib libraries and helper executables -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/lib">
+	    <include name="*.so"/>
+	    <include name="appserv"/>
+	    <include name="appservAgent"/>
+	    <include name="appservDAS"/>
+	    <include name="appservLauncher"/>
+	</fileset>
+    </chmod>
+    <!-- the IMQ executables -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/imq/bin"/>
+    </chmod>
+    <!-- Apache ANT -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/lib/ant/bin">
+	    <!--
+	     We don't plan to run GlassFish under Cygwin.
+	     Cygwin requires executable bits for all the .exe, .dll, .bat and .cmd.
+	     If you want to run GlassFish under Cygwin, comment the following <exclude/>.
+	    -->
+	    <exclude name="*.bat"/>
+	    <exclude name="*.cmd"/>
+	</fileset>
+    </chmod>
+    <!-- lbplugin libraries -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/lib/lbplugin/lib">
+	    <include name="**/*.so"/>
+	</fileset>
+    </chmod>
+    <!-- Netscape security executables -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/lib/upgrade"/>
+    </chmod>
+    <!-- javadb -->
+    <chmod perm="ugo+x">
+	<fileset dir="${install.home}/javadb/frameworks/NetworkServer/bin">
+	    <include name="*.ksh"/>
+	    <!--
+	     For Cygwin use the following:
+		<include name="*.bat"/>
+		<include name="*.cmd"/>
+	    -->
+	</fileset>
     </chmod>
-</target>
-
-<target name="do.chmod.linux" depends="setup.init" if="linux">
-    <echo message="Changing permissions on Linux"/>
-    <exec executable="chmod" failonerror="true">
-        <arg line="-R"/>
-        <arg line="ugo+x"/>
-        <arg line="${install.home}/imq/bin"/>
-        <arg line="${install.home}/bin"/>
-        <arg line="${install.home}/lib"/>
-    </exec>
 </target>
 
 <target name="create.domain" depends="setup.init,set.env">