Index: build.xml
===================================================================
--- build.xml	(revision 600175)
+++ build.xml	(working copy)
@@ -1243,13 +1243,19 @@
 
   </target>
 
+  <!-- Add localized jars to the classpath -->
+  <target name="make-locale-classpath-manifest">
+      <manifest file="${manifest.file}" mode="${manifest.mode}">
+          <attribute name="Class-Path" value="derbyLocale_cs.jar derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
+      </manifest>
+  </target>
+
   <target name="make-core-derbyjar-manifest">
 
     <manifest file="${manifest.file}">
       <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
       <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
       <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
-      <attribute name="Class-Path" value="derbyLocale_cs.jar derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
 
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/tools/sysinfo/">
@@ -1281,6 +1287,11 @@
     	</section>
     </manifest> 
 
+    <antcall target="make-locale-classpath-manifest">
+        <param name="manifest.file" value="${manifest.file}"/>
+        <param name="manifest.mode" value="update"/>
+    </antcall>
+
   </target>
 
 <!-- - - - - - - - - - - - -  derbytools.jar target - - - - - - - - - - -->
@@ -1316,6 +1327,10 @@
 
     <!-- copy boilerplate common to derby jar files -->
     <antcall target="meta-inf-common"/>
+    <antcall target="make-locale-classpath-manifest">
+        <param name="manifest.file" value="${derby.jar.dir}/lists/smftools.mf"/>
+        <param name="manifest.mode" value="replace"/>
+    </antcall>
 
     <delete file="${derby.jar.dir}/derbytools.jar"/>
     <jar destfile="${derby.jar.dir}/derbytools.jar"
@@ -1324,6 +1339,7 @@
          compress="true"
          filesonly="true"/>
     <jar destfile="${derby.jar.dir}/derbytools.jar"
+         manifest="${derby.jar.dir}/lists/smftools.mf"
          compress="true"
          filesonly="true"
          update="true">