--- build.xml.old	2012-02-05 18:47:45.000000000 +0100
+++ build.xml	2012-02-05 18:52:41.000000000 +0100
@@ -184,7 +184,7 @@
 
 	<!-- Run the JPF Code Generator -->
 	<target name="generate" unless="needsNoRegenerate">
-		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true">
+		<java classname="net.sf.jabref.plugin.util.CodeGenerator" fork="true" failonerror="true">
 			<arg value="${plugin.dir}" />
 			<classpath refid="codegenerator" />
 		</java>
@@ -231,7 +231,7 @@
 	</target>
 
 	<!-- Jars up project -->
-	<target name="jars" depends="build, unjarlib">
+	<target name="jars" depends="build">
 		<mkdir dir="${build.lib}" />
         
 		<mkdir dir="${build.tmp}" />
@@ -430,6 +430,7 @@
 
 
 	<target name="osxjar">
+	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 		<jarbundler dir="${build.lib}"
                     name="JabRef"
                     mainclass="net.sf.jabref.JabRef"
@@ -649,6 +650,5 @@
 		</jalopy>
 	</target>
 
-	<taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 
 </project>