diff --git a/java-sdk/build.xml b/java-sdk/build.xml
index e310c73..9557c7b 100644
--- a/build.xml
+++ b/build.xml
@@ -68,8 +68,7 @@
 
     <!-- the following is to setup the correct info for sun jsse which
         is jdk dependent -->
-    <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss4.jar"/>
-    <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss4.jar"/>
+    <property name="ssllibs14" value="${jss.lib}"/>
 
     <!-- we do not use the users existing classpath and instead build our own
          comment the following line out if this is not desired -->
@@ -187,14 +186,20 @@
         <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
             excludes="cvs/**"
             classpath="${jsselibs}:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
         <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
             excludes="cvs/**"
             classpath="${jsselibs}:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
         <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
             excludes="cvs/**"
             classpath="${jsselibs}:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
       </target>
 
@@ -202,6 +207,8 @@
         <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
             excludes="cvs/**"
             classpath="${jdk.dist}:${jsselibs}:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
       </target>
 
@@ -210,6 +217,8 @@
         <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
             excludes="cvs/**"
             classpath="${jsselibs}:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
       </target>
 
@@ -218,6 +227,8 @@
         <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
             excludes="cvs/**"
             classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar:${slf4j.lib}"
+            source="1.8"
+            target="1.8"
         />
       </target>
 
@@ -232,7 +243,7 @@
                  author="true"
                  version="true"
                  use="true"
-                 classpath="${basedir}/ldapjdk:${jss.lib}:${basedir}/ldapjdk/lib/jss32_stub.jar:${basedir}/ldapbeans:${slf4j.lib}"
+                 classpath="${basedir}/ldapjdk:${jss.lib}:${basedir}/ldapbeans:${slf4j.lib}"
                  additionalparam="-Xdoclint:none">
         </javadoc>