--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -34,17 +34,16 @@
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=thunderbird
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
-MOZ_MATHML=
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
 MOZ_OJI=
 NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource"
 MOZ_IMG_DECODERS_DEFAULT=`echo "$MOZ_IMG_DECODERS_DEFAULT" | sed "s/ xbm//"`
 MOZ_MAIL_NEWS=1
 if [ "$COMM_BUILD" ]; then
   MOZ_LDAP_XPCOM=1

--- a/mail/installer/windows/packages-static
+++ b/mail/installer/windows/packages-static
@@ -403,23 +403,24 @@ bin\components\places.xpt
 bin\components\prefetch.xpt
 
 bin\res\hiddenWindow.html
 bin\res\ua.css
 bin\res\html.css
 bin\res\quirk.css
 bin\res\forms.css
 bin\res\viewsource.css
+bin\res\mathml.css
 bin\res\charsetData.properties
 bin\res\charsetalias.properties
 bin\res\langGroups.properties
 bin\res\language.properties
 bin\res\wincharset.properties
 bin\res\entityTables\*
-bin\res\dtd\xhtml11.dtd
+bin\res\dtd\*
 bin\res\arrow.gif
 bin\res\arrowd.gif
 bin\res\broken-image.gif
 bin\res\contenteditable.css
 bin\res\designmode.css
 bin\res\loading-image.gif
 bin\res\html\folder.png