--- a/build.xml
+++ b/build.xml
@@ -49,7 +49,8 @@
    </path>
    <path id="javac.classpath.demo">
       <path refid="javac.classpath" />
-      <pathelement location="${lib.dir}/looks-2.1.1.jar" />
+      <pathelement location="${lib.dir}/jgoodies-looks.jar" />
+      <pathelement location="${lib.dir}/jgoodies-common.jar" />
    </path>
    <path id="javac.classpath.test">
       <path refid="javac.classpath" />
@@ -104,7 +105,7 @@
       <condition property="os.unixWithXlib">
          <and>
             <os family="unix"/>
-            <available file="/usr/X11R6/include/X11/Xlib.h"/>
+            <available file="/usr/include/X11/Xlib.h"/>
          </and>
       </condition>
    </target>
@@ -199,7 +200,6 @@
               I believe this BUG is the cause: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4490798 -->
          <manifest>
             <!-- matches core jar name -->
-            <attribute name="Class-Path" value="${dist.jar.name} lib/jmf/lib/jmf.jar lib/looks-2.1.1.jar"/> 
             <attribute name="Main-Class" value="org.flexdock.demos.AllDemos"/>
          </manifest>
       </jar>