Index: build.xml
===================================================================
--- build.xml	(revision 598002)
+++ build.xml	(working copy)
@@ -1316,6 +1316,10 @@
 
     <!-- copy boilerplate common to derby jar files -->
     <antcall target="meta-inf-common"/>
+    <!-- we need a manifest to ensure that message files are on classpath -->
+    <antcall target="make-core-derbyjar-manifest">
+      <param name="manifest.file" value="${derby.jar.dir}/lists/smftools.mf"/>
+    </antcall>
 
     <delete file="${derby.jar.dir}/derbytools.jar"/>
     <jar destfile="${derby.jar.dir}/derbytools.jar"
@@ -1326,7 +1330,8 @@
     <jar destfile="${derby.jar.dir}/derbytools.jar"
          compress="true"
          filesonly="true"
-         update="true">
+         update="true"
+         manifest="${derby.jar.dir}/lists/smftools.mf">
       <fileset dir="${out.dir}"
                includes="org/apache/derby/loc/sysinfoMessages.properties,
                          org/apache/derby/loc/toolsmessages.properties,