--- build.xml.sav0	2006-03-17 00:14:04.000000000 +0100
+++ build.xml	2008-03-11 15:33:50.000000000 +0100
@@ -158,7 +158,7 @@
         <jar jarfile="${release.imap.jar}" update="yes" manifest="${basedir}/imap.mf">
             <fileset dir="${component.classes.dir}">
                 <include name="com/sun/mail/iap/*.class"/>
-                <include name="com/sun/mail/imap/*.class"/>
+                <include name="com/sun/mail/imap/**/*.class"/>
             </fileset>
             <metainf dir="META-INF"
                      includes="javamail.providers"/>
@@ -202,6 +202,8 @@
                 <include name="com/sun/mail/dsn/*.class"/>
                 <include name="com/sun/mail/dsn/mailcap"/>
             </fileset>
+            <metainf dir="${src.dir}/com/sun/mail/dsn"
+                     includes="mailcap"/>
         </jar>
      </target>
 
@@ -215,7 +217,7 @@
                 <include name="com/sun/mail/handlers/*.class"/>
             </fileset>
             <metainf dir="META-INF"
-                     includes="javamail.default.providers, javamail.default.address.map"/>
+                     includes="javamail.charset.map, javamail.default.providers, javamail.default.address.map, mailcap"/>
         </jar>
      </target>