diff --git a/build.xml b/build.xml
index 9d8f971443070bf2469c6faf788309d8eec99da3..9959c82dedb479b9e188a6098af02fca649bd9f4 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
     <!-- <property name="tests.dir" value="${base.dir}/tests" /> -->
     <property name="dist.dir" value="${base.dir}/dist" />
     <property name="lib.dir" value="${basedir}/lib" /> 
+    <property name="lib-bin.dir" value="${basedir}/lib-bin" />
     <property name="build.dir" value="${base.dir}/bin" />
 
     <property name="build.plugin.funcheck.dir" value="${build.dir}/plugin" />
@@ -128,7 +129,7 @@
             <fileset file="./scalac-plugin.xml" />
         </jar>
 
-        <echo file="${script.file}" message="#!/bin/sh${line.separator}scalac -cp ./lib/z3.jar -Xplugin:${dist.jar} $@${line.separator}" />
+        <echo file="${script.file}" message="#!/bin/sh${line.separator}LD_LIBRARY_PATH=${lib-bin.dir} java -Dscala.home=${scala.home} -classpath ${scala-library.jar}:${scala-compiler.jar}:${distjar}:${lib.dir}/z3.jar scala.tools.nsc.Main -Xplugin:${dist.jar} $@${line.separator}" />
         <chmod file="${script.file}" perm="u+x" />
     </target>
 
diff --git a/lib-bin/libz3.so b/lib-bin/libz3.so
new file mode 100755
index 0000000000000000000000000000000000000000..e06583bde96cdd8b02c8df4ffd59d25354669b16
Binary files /dev/null and b/lib-bin/libz3.so differ
diff --git a/lib/z3.jar b/lib/z3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a245fa031db943c196ea6496f7d5bd43a30ef500
Binary files /dev/null and b/lib/z3.jar differ
diff --git a/s-f b/s-f
deleted file mode 100755
index 5ac3f3d27a2b992290944f8cb26b752568384507..0000000000000000000000000000000000000000
--- a/s-f
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-SCALALIBDIR=/home/psuter/scala/current/lib
-DISTDIR=/home/psuter/guru-svn/funcheck/dist
-LIBDIR=/home/psuter/guru-svn/funcheck/lib
-SCALAHOME=/home/psuter/scala/current
-LD_LIBRARY_PATH=/home/psuter/software/z3/lib java -Dscala.home=${SCALAHOME} -classpath ${SCALALIBDIR}/scala-compiler.jar:${SCALALIBDIR}/scala-library.jar:${DISTDIR}/funcheck-plugin.jar:${LIBDIR}/z3.jar scala.tools.nsc.Main -Xplugin:${DISTDIR}/funcheck-plugin.jar $@