--- a/freemind/build.xml
+++ b/freemind/build.xml
@@ -33,15 +33,10 @@
 	<property name="java_source_version" value="1.4" />
 	<property name="java_target_version" value="1.4" />
 	<property name="build.compiler" value="modern" />
-	<property name="jarbundler.jar" value = "jarbundler-2.0.0.jar"/>
-
-	<taskdef name="jarbundler"
-               classpath="${src}/lib/${jarbundler.jar}"
-               classname="net.sourceforge.jarbundler.JarBundler" />
-
-
-	<!-- begin generator part -->
-	<property name="jibxhome" location="lib/jibx"/>
+ 	<property name="java.dir" value="/usr/share/java" />
+  
+  	<!-- begin generator part -->
+ 	<property name="jibxhome" value="${java.dir}"/>
 	<property name="jibxjar" location="lib/bindings.jar"/>
 	<property name="jibxruntimelibs" value="${jibxhome}/jibx-run.jar:${jibxhome}/xpp3.jar"/>
 	<property name="jibxlibs" value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind.jar:${jibxhome}/jibx-extras.jar:${jibxruntimelibs}"/>
@@ -49,7 +44,7 @@
 		<classpath path="${jibxlibs}"/>
 	</taskdef>
 
-	<property name="classpath" value="${jibxruntimelibs}:${jibxjar}:lib/forms-1.0.5.jar:lib/SimplyHTML/SimplyHTML.jar"/>
+	<property name="classpath" value="${jibxruntimelibs}:${jibxjar}:${java.dir}/forms.jar:${java.dir}/SimplyHTML.jar"/>
 
 	  <target name="xmlbind.checkStatusOfGeneration">
 	    <uptodate property="xmlbind.isUpToDate"
@@ -170,11 +165,6 @@
 			/>
 		</copy>
 		<chmod file="${dist}/freemind.sh" perm="u+rx"/>
-		<copy todir="${dist}">
-			<fileset dir="${src}/windows-launcher">
-			  <include name="FreeMind.exe"/>
-			</fileset>
-		</copy>
 		<mkdir dir="${dist}/doc" />
 		<copy todir="${dist}/doc">
 			<fileset dir="${src}/doc/">
@@ -194,14 +184,7 @@
 		<mkdir dir="${dist.lib}" />
 		<copy todir="${dist.lib}">
 			<fileset dir="${src}/lib">
-				<include name="forms-1.0.5.jar"/>
 				<include name="bindings.jar"/>
-				<include name="jibx/jibx-run.jar"/>
-				<include name="jibx/xpp3.jar"/>
-				<include name="SimplyHTML/gnu-regexp-1.1.4.jar"/>
-				<include name="SimplyHTML/SimplyHTML.jar"/>
-				<include name="SimplyHTML/SimplyHTMLHelp.jar"/>
-				<include name="SimplyHTML/jhall.jar"/>
 			</fileset>
 		</copy>
 
@@ -211,15 +194,9 @@
 		<condition property="isMacOs">
 			<os family="mac"/>
 		</condition>
-		<antcall target="dist_icon"/>
 		<antcall target="dist_macos"/>
 	</target>
 
-	<target name="dist_icon">
-<!--		<copy file="${src}/windows-launcher/Freemind_light_bulb.exe"
-			tofile="${dist}/Freemind.exe" overwrite="true"/> -->
-	</target>
-
 	<target name="dist_macos" if="isMacOs">
 		<delete dir="${dist_macos}"/>
 		<mkdir dir="${dist_macos}"/>
@@ -513,7 +490,7 @@
 	<target name="val">
 		<xmlvalidate lenient="false"
 		  failonerror="no" warn="true" classname="org.apache.xerces.parsers.SAXParser"
-            classpath="plugins/svg/xerces_2_5_0.jar">
+            classpath="${java.dir}/xercesImpl.jar">
 			<fileset dir="." includes="**/*.mm"/>
 			<attribute name="http://apache.org/xml/features/validation/schema"
 		  value="true"/>