diff --git a/build.xml b/build.xml
index 0981cc5..bb52951 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
     <property file="build.properties" />
 
     <property name="jar.dir" value="lib"/>
+    <property name="systemjar.dir" value="/usr/share/java"/>
     <property name="plugin.dir" value="plugin"/>
     <property name="build.dir" value="build"/>
     <property name="junit.dir" value="build/junit"/>
@@ -60,24 +61,23 @@
     <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
 
     <path id="findbugs.classpath">
-        <pathelement location="${jar.dir}/bcel.jar"/>
-        <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-        <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-        <pathelement location="${jar.dir}/junit.jar"/>
-        <pathelement location="${jar.dir}/asm-3.3.jar"/>
-        <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
-        <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
-        <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
-        <pathelement location="${jar.dir}/jsr305.jar"/>
-        <pathelement location="${jar.dir}/jFormatString.jar"/>
-        <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
-        <pathelement location="${jar.dir}/jcip-annotations.jar"/>
+        <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
+        <pathelement location="${systemjar.dir}/dom4j.jar"/>
+        <pathelement location="${systemjar.dir}/junit.jar"/>
+        <pathelement location="${systemjar.dir}/objectweb-asm/asm.jar"/>
+        <pathelement location="${systemjar.dir}/objectweb-asm/asm-commons.jar"/>
+        <pathelement location="${systemjar.dir}/objectweb-asm/asm-tree.jar"/>
+        <pathelement location="${systemjar.dir}/jaxen.jar"/>
+        <pathelement location="${systemjar.dir}/jsr-305.jar"/>
+        <pathelement location="${systemjar.dir}/jFormatString.jar"/>
+        <pathelement location="${systemjar.dir}/apache-commons-lang.jar"/>
+        <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
     </path>
 
     <path id="tools.classpath">
         <pathelement location="${classes.dir}"/>
         <pathelement location="${jar.dir}/findbugs.jar"/>
-        <pathelement location="${jar.dir}/jdepend-2.9.jar"/>
+        <pathelement location="${systemjar.dir}/jdepend.jar"/>
         <path refid="findbugs.classpath"/>
     </path>
 
@@ -329,8 +329,6 @@
             <fileset dir="${src.dir}">
                 <include name="**/annotations/*.java"/>
             </fileset>
-            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
         </jar>
     </target>
 
diff --git a/design/architecture/Makefile b/design/architecture/Makefile
index 8765025..0fc7869 100644
--- a/design/architecture/Makefile
+++ b/design/architecture/Makefile
@@ -4,6 +4,7 @@ PDFS = $(TEX_SRCS:.tex=.pdf)
 %.pdf : %.tex
 	pdflatex $*
 	pdflatex $*
+	pdflatex $*
 
 all : $(PDFS)