diff --git a/core/build.xml b/core/build.xml
index eecb754efe..02abcec026 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -30,6 +30,8 @@
   <property name="my-classes-plan.dir" value="${my-build.dir}/classes-plan"/>
   <property name="my-src.dir" value="${basedir}/src"/>
   <property name="my-non-resources" value="**/*.java,**/package.html"/>
+  <property name="my-classlib-classes.dir" value="${my-build.dir}/classes-classlib"/>
+  <property name="classlib.jar" value="${basedir}/../all/lib/classlib.jar"/>
 	
   <!-- Subproject specific classpath -->
   <path id="my-cp">
@@ -132,8 +134,35 @@
     <mkdir dir="${my-classes.dir}"/>
     <mkdir dir="${my-testclasses.dir}"/>
     <mkdir dir="${my-gen.dir}"/>
+    <mkdir dir="${my-classlib-classes.dir}"/>
   	<jnode.copy-descriptors/>
+  </target>
+
+  <!-- Compile classlib sources and create the classlib.jar -->
+  <target name="compile-classlib" depends="prepare">
+    <echo message="Compiling classlib sources to create classlib.jar"/>
+    <mkdir dir="${my-classlib-classes.dir}"/>
+    <javac destdir="${my-classlib-classes.dir}"
+           debug="on"
+           optimize="on"
+           fork="on"
+           memoryMaximumSize="${memoryMaximumSize}"
+           compiler="modern"
+           includeJavaRuntime="false"
+           target="${java.target}"
+           source="${java.source}"
+           encoding="${java.encoding}"
+           excludes="**/*-template.java,**/package-info.java">
+      <src>
+        <pathelement location="${my-src.dir}/classlib"/>
+      </src>
+    </javac>
+    <jar destfile="${classlib.jar}" basedir="${my-classlib-classes.dir}" includes="**/*.class"/>
+    <echo message="Created ${classlib.jar}"/>
+  </target>
 
+  <!-- Compile all subproject java files -->
+  <target name="compile" depends="compile-classlib">
   	<copy todir="${my-classes.dir}">
       <fileset dir="${my-src.dir}/classpath/vm" includes="**/*.security"/>
       <fileset dir="${my-src.dir}/openjdk/vm" includes="**/*.jav"/>
@@ -154,10 +183,7 @@
           tofile="${my-gen.dir}/org/jnode/security/JNodeSecurityManagerSettings.java">
         <token name="@jnode.security.enabled@" value="${jnode.security.enabled}"/>
     </template>
-  </target>
 
-  <!-- Compile all subproject java files -->
-  <target name="compile" depends="prepare">
       <jnode.compile>
         <src refid="my-sources" />
         <classpath refid="my-cp"/>