--- ./nbbuild/templates/common.xml.orig	2006-10-08 13:31:58.000000000 +0200
+++ ./nbbuild/templates/common.xml	2006-10-08 13:36:24.000000000 +0200
@@ -82,7 +82,7 @@
                 <isset property="javac.target"/>
             </not>
         </condition>
-        <javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
+	<javac srcdir="${src.dir}" destdir="${build.classes.dir}" debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}" deprecation="${build.compiler.deprecation}" optimize="${build.compiler.optimize}" source="${javac.source}" target="${javac.target}" includeantruntime="false" classpath="${gcj.jar}">
             <classpath refid="cp"/>
         </javac>
         <!-- Sanity check: -->
--- ./nbbuild/build.xml.orig	2006-10-08 13:17:03.000000000 +0200
+++ ./nbbuild/build.xml	2006-10-08 13:17:18.000000000 +0200
@@ -85,7 +85,7 @@
     <!-- OK, continue: -->
     <mkdir dir="build/antclasses"/>
     <javac srcdir="antsrc" destdir="build/antclasses" deprecation="true" debug="${build.compiler.debug}" source="1.4"
-	    classpath="${ant.jar}">
+	    classpath="${ant.jar}:${gcj.jar}">
       <classpath refid="bootstrap-cp"/>
     </javac>
     <jar jarfile="nbantext.jar">