diff --git a/build.xml b/build.xml
index b2fd92f17..82a68d70a 100644
--- a/build.xml
+++ b/build.xml
@@ -186,6 +186,13 @@
       <filename name="${util.package}/java15/*"/>
     </or>
   </selector>
+	
+  <selector id="needs.jdk1.6+">
+  	<or>
+      <filename name="${condition.package}/HasFreeSpace*"/>
+  	  <filename name="${util.package}/java16/*"/>
+  	</or>
+  </selector>
 
   <!-- Kaffe has some JDK 1.5 features including java.lang.Readable,
        but not all of them -->
@@ -378,7 +385,7 @@
     <available property="jdk1.3+" classname="java.lang.StrictMath"/>
     <available property="jdk1.4+" classname="java.lang.CharSequence"/>
     <available property="jdk1.5+" classname="java.net.Proxy"/>
-    <available property="jdk1.6+" classname="java.util.Service"/>
+    <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
     <available property="kaffe" classname="kaffe.util.NotImplemented"/>
     <available property="bsf.present"
       classname="org.apache.bsf.BSFManager"
@@ -638,6 +645,7 @@
             <selector refid="needs.jdk1.3+" unless="jdk1.3+"/>
             <selector refid="needs.jdk1.4+" unless="jdk1.4+"/>
             <selector refid="needs.jdk1.5+" unless="jdk1.5+"/>
+          	<selector refid="needs.jdk1.6+" unless="jdk1.6+"/>
             <selector refid="not.in.kaffe" if="kaffe"/>
 
             <selector refid="needs.trax" unless="trax.present"/>