--- custom-build.xml.orig	2010-10-25 11:15:20.000000000 -0400
+++ custom-build.xml	2010-10-25 11:16:03.000000000 -0400
@@ -129,8 +129,7 @@
             <arg value="BUILD_DIR=${jni.build.dir}"/>
             <arg value="CPU=${platform.cpu}"/>
             <arg value="VERSION=${jffi.version.major}.${jffi.version.minor}"/>
-            <arg value="USE_SYSTEM_LIBFFI=${use.system.libffi}"/>
-            <!-- <arg value="USE_SYSTEM_LIBFFI=0"/> -->
+            <arg value="USE_SYSTEM_LIBFFI=1"/>
             <arg value="-f"/>
             <arg value="${jni.GNUmakefile}"/>
         </exec>
@@ -198,18 +197,7 @@
     <target name="-assemble-native-jar" depends="-init-vars, -build-platform-jar">
         <jar jarfile="${native.jar}" index="true" update="true" duplicate="preserve"
             filesetmanifest="skip">
-            <zipfileset src="archive/jffi-Darwin.jar"/>
             <zipfileset src="${dist.dir}/jffi-${platform}.jar"/>
-            <zipfileset src="archive/jffi-i386-Windows.jar"/>
-            <zipfileset src="archive/jffi-i386-Linux.jar"/>
-            <zipfileset src="archive/jffi-i386-SunOS.jar"/>
-            <zipfileset src="archive/jffi-x86_64-SunOS.jar"/>
-            <zipfileset src="archive/jffi-x86_64-Linux.jar"/>
-            <zipfileset src="archive/jffi-s390x-Linux.jar"/>
-            <zipfileset src="archive/jffi-sparc-SunOS.jar"/>
-            <zipfileset src="archive/jffi-sparcv9-SunOS.jar"/>
-            <zipfileset src="archive/jffi-ppc-AIX.jar"/>
-            <zipfileset src="archive/jffi-ppc-Linux.jar"/>
         </jar>
     </target>
     <target name="-archive-platform-jar" depends="-build-platform-jar">