4 files changed, 267 insertions, 66 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 2a70126da7cd..1fe5ac4007b5 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	2.0.0.20
-PORTREVISION=	1
+PORTVERSION=	3.5
 CATEGORIES=	www
 MASTER_SITE_SUBDIR?=	firefox/releases/${PORTVERSION}/linux-i686/en-US
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-FORBIDDEN=	Security issues http://www.vuxml.org/freebsd/8b491182-f842-11dd-94d9-0030843d3802.html
+USE_LDCONFIG=	yes
+USE_BZIP2=	yes
 
 .include "${.CURDIR}/../linux-seamonkey/Makefile.common"
 .include <bsd.port.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 3dccd624476c..74f2f2c21152 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,3 +1,3 @@
-MD5 (firefox-2.0.0.20.tar.gz) = 7ceda614cd8d44b135c1b6b9648b087f
-SHA256 (firefox-2.0.0.20.tar.gz) = 1775c9cd7ee1da98fefbb0723b4b379d45924c4f8c5949012d41aac7b0d7b792
-SIZE (firefox-2.0.0.20.tar.gz) = 9710348
+MD5 (firefox-3.5.tar.bz2) = b61ebc6e31cff3f8ad653f31c3bd6b1b
+SHA256 (firefox-3.5.tar.bz2) = 4dcd9794bec2108e01944eea94f3acc59691838b84ee6a8bd336620866d49d8a
+SIZE (firefox-3.5.tar.bz2) = 9908255
diff --git a/www/linux-firefox/files/linux-firefox.desktop.in b/www/linux-firefox/files/linux-firefox.desktop.in
index f022f2e98178..bd3d13badfd4 100644
--- a/www/linux-firefox/files/linux-firefox.desktop.in
+++ b/www/linux-firefox/files/linux-firefox.desktop.in
@@ -189,3 +189,194 @@ Terminal=false
 Type=Application
 Categories=Application;Network;
 MimeType=text/html;text/xml;application/xhtml+xml;
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser (Linux)
+Name[am]=
+Name[ar]=
+Name[az]=Firefox Veb Səyyahı (Linux)
+Name[be]=
+Name[bg]=Интернет браузър Firefox (Linux)
+Name[bn]=
+Name[bs]=Firefox web preglednik (Linux)
+Name[ca]=Navegador web Firefox (Linux)
+Name[cs]=Prohlížeč WWW Firefox (Linux)
+Name[cy]=Y Porwr Gwe Firefox (Linux)
+Name[da]=Firefox - internetsurfning (Linux)
+Name[de]=Firefox Webbrowser (Linux)
+Name[el]=Περιηγητής Διαδικτύου Firefox (Linux)
+Name[en_CA]=Firefox Web Browser (Linux)
+Name[en_GB]=Firefox Web Browser (Linux)
+Name[es]=Navegador Web Firefox (Linux)
+Name[et]=Firefox veebibrauser (Linux)
+Name[eu]=Firefox web arakatzailea (Linux)
+Name[fi]=Firefox, WWW-selain (Linux)
+Name[fr]=Navigateur Web Firefox (Linux)
+Name[ga]=Brabhsálaí Lín Firefox (Linux)
+Name[gu]=એપીફની વૅબ બ્રાઉઝર (Linux)
+Name[he]=דפדפן Firefox (Linux)
+Name[hi]=
+Name[hr]=Firefox Web preglednik (Linux)
+Name[hu]=Firefox webböngésző (Linux)
+Name[id]=Web Browser Firefox (Linux)
+Name[it]=Browser web Firefox (Linux)
+Name[ja]=Firefox ウェブ・ブラウザ (Linux)
+Name[ko]=Firefox 웹 브라우저 (Linux)
+Name[li]=Firefox Web Browser (Linux)
+Name[lt]=Firefox web naršyklė (Linux)
+Name[mk]=Firefox веб прелистувач (Linux)
+Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസ‌ര് (Linux)
+Name[mn]=Firefox веб хөтөч (Linux)
+Name[ms]=Pelungsur Web Firefox (Linux)
+Name[nb]=Firefox nettleser (Linux)
+Name[nl]=Firefox Webbrowser (Linux)
+Name[nn]=Firefox nettlesar (Linux)
+Name[no]=Firefox nettleser (Linux)
+Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ (Linux)
+Name[pl]=Przeglądarka WWW Firefox (Linux)
+Name[pt]=Navegador Web Firefox (Linux)
+Name[pt_BR]=Navegador Web Firefox (Linux)
+Name[ro]=Navigatorul Firefox (Linux)
+Name[ru]=Веб-браузер Firefox (Linux)
+Name[sk]=
+Name[sl]=Spletni brskalnik Firefox (Linux)
+Name[sq]=Firefox - Shfletuesi Web (Linux)
+Name[sr]=
+Name[sr@Latn]=Veb čitač Spoznaja (Linux)
+Name[sv]=Webbläsaren Firefox (Linux)
+Name[ta]=எபிபனி வலை உலாவி (Linux)
+Name[tk]=Firefox Web Ahtarçisi (Linux)
+Name[tr]=Firefox Web Tarayıcı (Linux)
+Name[uk]=Переглядач web Firefox (Linux)
+Name[vi]=Trình Duyệt Web Firefox (Linux)
+Name[wa]=Betchteu waibe epiphany (Linux)
+Name[zh_CN]=Firefox Web 浏览器 (Linux)
+Name[zh_TW]=Firefox 網頁瀏覽器 (Linux)
+GenericName=Web Browser (Linux)
+GenericName[ar]=متصفّح الانترنت (Linux)
+GenericName[az]=Veb Səyyahı (Linux)
+GenericName[be]=Вандроўнік па павуціньню (Linux)
+GenericName[bg]=Браузър (Linux)
+GenericName[bn]=ওয়েব ব্রাউজার (Linux)
+GenericName[bs]=Web preglednik (Linux)
+GenericName[ca]=Navegador web (Linux)
+GenericName[cs]=Prohlížeč WWW (Linux)
+GenericName[cy]=Porwr Gwe (Linux)
+GenericName[da]=Internetsurfning (Linux)
+GenericName[de]=Webbrowser (Linux)
+GenericName[el]=Περιηγητής Ιστοσελίδων (Linux)
+GenericName[en_CA]=Web Browser (Linux)
+GenericName[en_GB]=Web Browser (Linux)
+GenericName[es]=Navegador web (Linux)
+GenericName[et]=Veebilehitseja (Linux)
+GenericName[eu]=Web arakatzailea (Linux)
+GenericName[fi]=WWW-selain (Linux)
+GenericName[fr]=Navigateur Web Firefox (Linux)
+GenericName[ga]=Brabhsálaí Lín (Linux)
+GenericName[gu]=વેબ બ્રાઉઝર (Linux)
+GenericName[he]=דפדפן אינטרנט (Linux)
+GenericName[hi]=वेब ब्राउज़र (Linux)
+GenericName[hr]=Web preglednik (Linux)
+GenericName[hu]=Webböngésző (Linux)
+GenericName[id]=Browser Web (Linux)
+GenericName[it]=Browser web (Linux)
+GenericName[ja]=GNOME ウェブ・ブラウザ (Linux)
+GenericName[ko]=웹 브라우저 (Linux)
+GenericName[li]=Wèb Browser (Linux)
+GenericName[lt]=Web naršyklė (Linux)
+GenericName[mk]=Веб прелистувач (Linux)
+GenericName[mn]=Веб хөтөч (Linux)
+GenericName[ms]=Pelungsur Web (Linux)
+GenericName[nb]=Nettleser (Linux)
+GenericName[nl]=Web-browser (Linux)
+GenericName[nn]=Nettlesar (Linux)
+GenericName[no]=Nettleser (Linux)
+GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ (Linux)
+GenericName[pl]=Przeglądarka WWW (Linux)
+GenericName[pt]=Navegador Web (Linux)
+GenericName[pt_BR]=Navegador Web (Linux)
+GenericName[ro]=Navigator Internet (Linux)
+GenericName[ru]=Веб-браузер (Linux)
+GenericName[sk]=WWW prehliadač (Linux)
+GenericName[sl]=Spletni brskalnik (Linux)
+GenericName[sq]=Shfletuesi Web (Linux)
+GenericName[sr]=Веб читач (Linux)
+GenericName[sr@Latn]=Veb čitač (Linux)
+GenericName[sv]=Webbläsare (Linux)
+GenericName[ta]=வலை உலாவி (Linux)
+GenericName[th]=เว็บบราวเซอร์ (Linux)
+GenericName[tk]=Web Ahtarçysy (Linux)
+GenericName[tr]=Web Tarayıcı (Linux)
+GenericName[uk]=Переглядач web-сторінок (Linux)
+GenericName[vi]=Trình duyệt Web (Linux)
+GenericName[wa]=Betchteu waibe (Linux)
+GenericName[zh_CN]=Web 浏览器 (Linux)
+GenericName[zh_TW]=網頁瀏覽器 (Linux)
+Comment=Browse the web
+Comment[ar]=تصفح الانترنت
+Comment[az]=Vebi gəzin
+Comment[be]=Вандраваць па павуціньню
+Comment[bg]=Сърфиране в интернет
+Comment[bn]=ওয়েব ব্রাউজ করুন
+Comment[bs]=Pregledaj na internetu
+Comment[ca]=Navegueu per la web
+Comment[cs]=Prohlížet WWW
+Comment[cy]=Pori'r we
+Comment[da]=Surf på internettet
+Comment[de]=Im Web surfen
+Comment[el]=Περιήγηση στον παγκόσμιο ιστό
+Comment[en_CA]=Browse the web
+Comment[en_GB]=Browse the web
+Comment[es]=Navegar por la web
+Comment[et]=Sirvi veebi
+Comment[eu]=Arakatu web-a
+Comment[fi]=Selaa WWW:tä
+Comment[fr]=Naviguer sur Internet
+Comment[ga]=Brabhsáil an Líon
+Comment[gu]=વેબમાં શોધો
+Comment[he]=גלוש ברשת
+Comment[hi]=वेब ब्राउज़ करें
+Comment[hr]=Pregledaj Web
+Comment[hu]=A világháló böngészése
+Comment[id]=Jelajah web
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[li]=Blajere op internet
+Comment[lt]=Naršyti internete
+Comment[mk]=Прелистувајте на веб
+Comment[ml]=വലക്കെട്ട് തിരയുക
+Comment[mn]=Веб броузе хийх
+Comment[ms]=Layari web
+Comment[nb]=Surf på nettet
+Comment[nl]=Websurfen
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼
+Comment[pl]=Przeglądanie stron WWW
+Comment[pt]=Navegar na web
+Comment[pt_BR]=Navegar na web
+Comment[ro]=Navigare Internet
+Comment[ru]=Веб-браузер
+Comment[sk]=Prehliadať internet
+Comment[sl]=Brskaj po spletu
+Comment[sq]=Eksploro web-in
+Comment[sr]=Прегледај веб
+Comment[sr@Latn]=Pregledaj veb
+Comment[sv]=Surfa på nätet
+Comment[ta]=வலையில் உலாவு
+Comment[th]=ใช้งานเว็บบราวเซอร์ Firefox
+Comment[tk]=Webi Ahtar
+Comment[tr]=Web'e Gözat
+Comment[uk]=Програма перегляду web-сторінок
+Comment[vi]=Duyệt web
+Comment[wa]=Naivyî avå les waibes
+Comment[zh_CN]=浏览 Web
+Comment[zh_TW]=瀏覽網頁
+Exec=linux-firefox %U
+Icon=%%PREFIX%%/lib/%%APP_NAME%%/chrome/icons/default/default.xpm
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;
diff --git a/www/linux-firefox/pkg-plist b/www/linux-firefox/pkg-plist
index 729f0a5efd47..4211c923323c 100644
--- a/www/linux-firefox/pkg-plist
+++ b/www/linux-firefox/pkg-plist
@@ -1,6 +1,10 @@
 bin/%%APP_NAME%%
 share/applications/%%APP_NAME%%.desktop
 lib/%%APP_NAME%%/.autoreg
+lib/%%APP_NAME%%/README.txt
+lib/%%APP_NAME%%/Throbber-small.gif
+lib/%%APP_NAME%%/application.ini
+lib/%%APP_NAME%%/blocklist.xml
 lib/%%APP_NAME%%/browserconfig.properties
 lib/%%APP_NAME%%/chrome/browser.jar
 lib/%%APP_NAME%%/chrome/browser.manifest
@@ -10,7 +14,9 @@ lib/%%APP_NAME%%/chrome/comm.jar
 lib/%%APP_NAME%%/chrome/comm.manifest
 lib/%%APP_NAME%%/chrome/en-US.jar
 lib/%%APP_NAME%%/chrome/en-US.manifest
-lib/%%APP_NAME%%/chrome/icons/default/default.xpm
+lib/%%APP_NAME%%/chrome/icons/default/default16.png
+lib/%%APP_NAME%%/chrome/icons/default/default32.png
+lib/%%APP_NAME%%/chrome/icons/default/default48.png
 lib/%%APP_NAME%%/chrome/pippki.jar
 lib/%%APP_NAME%%/chrome/pippki.manifest
 lib/%%APP_NAME%%/chrome/reporter.jar
@@ -20,27 +26,43 @@ lib/%%APP_NAME%%/chrome/toolkit.manifest
 lib/%%APP_NAME%%/components/FeedConverter.js
 lib/%%APP_NAME%%/components/FeedProcessor.js
 lib/%%APP_NAME%%/components/FeedWriter.js
+lib/%%APP_NAME%%/components/NetworkGeolocationProvider.js
 lib/%%APP_NAME%%/components/WebContentConverter.js
+lib/%%APP_NAME%%/components/aboutCertError.js
+lib/%%APP_NAME%%/components/aboutPrivateBrowsing.js
+lib/%%APP_NAME%%/components/aboutRights.js
+lib/%%APP_NAME%%/components/aboutRobots.js
+lib/%%APP_NAME%%/components/aboutSessionRestore.js
 lib/%%APP_NAME%%/components/browser.xpt
+lib/%%APP_NAME%%/components/fuelApplication.js
 lib/%%APP_NAME%%/components/jsconsole-clhandler.js
-lib/%%APP_NAME%%/components/libjar50.so
-lib/%%APP_NAME%%/components/libjsd.so
+lib/%%APP_NAME%%/components/libbrowsercomps.so
+lib/%%APP_NAME%%/components/libbrowserdirprovider.so
+lib/%%APP_NAME%%/components/libdbusservice.so
+lib/%%APP_NAME%%/components/libimgicon.so
 lib/%%APP_NAME%%/components/libmozgnome.so
-lib/%%APP_NAME%%/components/libmyspell.so
 lib/%%APP_NAME%%/components/libnkgnomevfs.so
-lib/%%APP_NAME%%/components/libspellchecker.so
-lib/%%APP_NAME%%/components/libxpinstall.so
-lib/%%APP_NAME%%/components/nsBookmarkTransactionManager.js
+lib/%%APP_NAME%%/components/nsAddonRepository.js
+lib/%%APP_NAME%%/components/nsBadCertHandler.js
+lib/%%APP_NAME%%/components/nsBlocklistService.js
 lib/%%APP_NAME%%/components/nsBrowserContentHandler.js
 lib/%%APP_NAME%%/components/nsBrowserGlue.js
-lib/%%APP_NAME%%/components/nsCloseAllWindows.js
+lib/%%APP_NAME%%/components/nsContentDispatchChooser.js
+lib/%%APP_NAME%%/components/nsContentPrefService.js
 lib/%%APP_NAME%%/components/nsDefaultCLH.js
-lib/%%APP_NAME%%/components/nsDictionary.js
+lib/%%APP_NAME%%/components/nsDownloadManagerUI.js
 lib/%%APP_NAME%%/components/nsExtensionManager.js
 lib/%%APP_NAME%%/components/nsFilePicker.js
+lib/%%APP_NAME%%/components/nsHandlerService.js
 lib/%%APP_NAME%%/components/nsHelperAppDlg.js
-lib/%%APP_NAME%%/components/nsInterfaceInfoToIDL.js
+lib/%%APP_NAME%%/components/nsLivemarkService.js
+lib/%%APP_NAME%%/components/nsLoginInfo.js
+lib/%%APP_NAME%%/components/nsLoginManager.js
+lib/%%APP_NAME%%/components/nsLoginManagerPrompter.js
 lib/%%APP_NAME%%/components/nsMicrosummaryService.js
+lib/%%APP_NAME%%/components/nsPlacesDBFlush.js
+lib/%%APP_NAME%%/components/nsPlacesTransactionsService.js
+lib/%%APP_NAME%%/components/nsPrivateBrowsingService.js
 lib/%%APP_NAME%%/components/nsProxyAutoConfig.js
 lib/%%APP_NAME%%/components/nsSafebrowsingApplication.js
 lib/%%APP_NAME%%/components/nsSearchService.js
@@ -49,12 +71,20 @@ lib/%%APP_NAME%%/components/nsSessionStartup.js
 lib/%%APP_NAME%%/components/nsSessionStore.js
 lib/%%APP_NAME%%/components/nsSetDefaultBrowser.js
 lib/%%APP_NAME%%/components/nsSidebar.js
+lib/%%APP_NAME%%/components/nsTaggingService.js
+lib/%%APP_NAME%%/components/nsTryToClose.js
 lib/%%APP_NAME%%/components/nsURLFormatter.js
 lib/%%APP_NAME%%/components/nsUpdateService.js
 lib/%%APP_NAME%%/components/nsUrlClassifierLib.js
 lib/%%APP_NAME%%/components/nsUrlClassifierListManager.js
-lib/%%APP_NAME%%/components/nsUrlClassifierTable.js
-lib/%%APP_NAME%%/components/nsXmlRpcClient.js
+lib/%%APP_NAME%%/components/nsWebHandlerApp.js
+lib/%%APP_NAME%%/components/pluginGlue.js
+lib/%%APP_NAME%%/components/storage-Legacy.js
+lib/%%APP_NAME%%/components/storage-mozStorage.js
+lib/%%APP_NAME%%/components/txEXSLTRegExFunctions.js
+lib/%%APP_NAME%%/crashreporter
+lib/%%APP_NAME%%/crashreporter-override.ini
+lib/%%APP_NAME%%/crashreporter.ini
 lib/%%APP_NAME%%/defaults/autoconfig/platform.js
 lib/%%APP_NAME%%/defaults/autoconfig/prefcalls.js
 lib/%%APP_NAME%%/defaults/pref/browser-prefs.js
@@ -69,22 +99,8 @@ lib/%%APP_NAME%%/defaults/profile/chrome/userContent-example.css
 lib/%%APP_NAME%%/defaults/profile/localstore.rdf
 lib/%%APP_NAME%%/defaults/profile/mimeTypes.rdf
 lib/%%APP_NAME%%/defaults/profile/prefs.js
-lib/%%APP_NAME%%/defaults/profile/search.rdf
 lib/%%APP_NAME%%/dictionaries/en-US.aff
 lib/%%APP_NAME%%/dictionaries/en-US.dic
-lib/%%APP_NAME%%/extensions/inspector@mozilla.org/chrome.manifest
-lib/%%APP_NAME%%/extensions/inspector@mozilla.org/chrome/inspector.jar
-lib/%%APP_NAME%%/extensions/inspector@mozilla.org/components/inspector-cmdline.js
-lib/%%APP_NAME%%/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
-lib/%%APP_NAME%%/extensions/inspector@mozilla.org/install.rdf
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/chrome.manifest
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/libqfaservices.so
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/qfaservices.xpt
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/master.ini
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback/talkback.so
-lib/%%APP_NAME%%/extensions/talkback@mozilla.org/install.rdf
 lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 lib/%%APP_NAME%%/firefox
 lib/%%APP_NAME%%/firefox-bin
@@ -95,26 +111,40 @@ lib/%%APP_NAME%%/icons/document.png
 lib/%%APP_NAME%%/icons/mozicon128.png
 lib/%%APP_NAME%%/icons/mozicon16.xpm
 lib/%%APP_NAME%%/icons/mozicon50.xpm
+lib/%%APP_NAME%%/icons/updater.png
 lib/%%APP_NAME%%/libfreebl3.chk
 lib/%%APP_NAME%%/libfreebl3.so
 lib/%%APP_NAME%%/libmozjs.so
 lib/%%APP_NAME%%/libnspr4.so
 lib/%%APP_NAME%%/libnss3.so
 lib/%%APP_NAME%%/libnssckbi.so
+lib/%%APP_NAME%%/libnssdbm3.so
+lib/%%APP_NAME%%/libnssutil3.so
 lib/%%APP_NAME%%/libplc4.so
 lib/%%APP_NAME%%/libplds4.so
 lib/%%APP_NAME%%/libsmime3.so
 lib/%%APP_NAME%%/libsoftokn3.chk
 lib/%%APP_NAME%%/libsoftokn3.so
+lib/%%APP_NAME%%/libsqlite3.so
 lib/%%APP_NAME%%/libssl3.so
 lib/%%APP_NAME%%/libxpcom.so
-lib/%%APP_NAME%%/libxpcom_compat.so
-lib/%%APP_NAME%%/libxpcom_core.so
-lib/%%APP_NAME%%/libxpistub.so
+lib/%%APP_NAME%%/libxul.so
+lib/%%APP_NAME%%/modules/DownloadLastDir.jsm
+lib/%%APP_NAME%%/modules/DownloadUtils.jsm
+lib/%%APP_NAME%%/modules/ISO8601DateUtils.jsm
+lib/%%APP_NAME%%/modules/Microformats.js
+lib/%%APP_NAME%%/modules/PlacesDBUtils.jsm
+lib/%%APP_NAME%%/modules/PluralForm.jsm
+lib/%%APP_NAME%%/modules/SpatialNavigation.js
+lib/%%APP_NAME%%/modules/WindowDraggingUtils.jsm
+lib/%%APP_NAME%%/modules/XPCOMUtils.jsm
+lib/%%APP_NAME%%/modules/debug.js
+lib/%%APP_NAME%%/modules/distribution.js
+lib/%%APP_NAME%%/modules/utils.js
 lib/%%APP_NAME%%/mozilla-xremote-client
 lib/%%APP_NAME%%/old-homepage-default.properties
+lib/%%APP_NAME%%/platform.ini
 lib/%%APP_NAME%%/plugins/libnullplugin.so
-lib/%%APP_NAME%%/readme.txt
 lib/%%APP_NAME%%/removed-files
 lib/%%APP_NAME%%/res/EditorOverride.css
 lib/%%APP_NAME%%/res/arrow.gif
@@ -122,7 +152,8 @@ lib/%%APP_NAME%%/res/arrowd.gif
 lib/%%APP_NAME%%/res/broken-image.gif
 lib/%%APP_NAME%%/res/charsetData.properties
 lib/%%APP_NAME%%/res/charsetalias.properties
-lib/%%APP_NAME%%/res/cmessage.txt
+lib/%%APP_NAME%%/res/contenteditable.css
+lib/%%APP_NAME%%/res/designmode.css
 lib/%%APP_NAME%%/res/dtd/mathml.dtd
 lib/%%APP_NAME%%/res/dtd/xhtml11.dtd
 lib/%%APP_NAME%%/res/entityTables/html40Latin1.properties
@@ -131,31 +162,16 @@ lib/%%APP_NAME%%/res/entityTables/html40Symbols.properties
 lib/%%APP_NAME%%/res/entityTables/htmlEntityVersions.properties
 lib/%%APP_NAME%%/res/entityTables/mathml20.properties
 lib/%%APP_NAME%%/res/entityTables/transliterate.properties
-lib/%%APP_NAME%%/res/fonts/fontEncoding.properties
 lib/%%APP_NAME%%/res/fonts/mathfont.properties
-lib/%%APP_NAME%%/res/fonts/mathfontCMEX10.properties
-lib/%%APP_NAME%%/res/fonts/mathfontCMSY10.properties
-lib/%%APP_NAME%%/res/fonts/mathfontMTExtra.properties
-lib/%%APP_NAME%%/res/fonts/mathfontMath1.properties
-lib/%%APP_NAME%%/res/fonts/mathfontMath2.properties
-lib/%%APP_NAME%%/res/fonts/mathfontMath4.properties
-lib/%%APP_NAME%%/res/fonts/mathfontPUA.properties
-lib/%%APP_NAME%%/res/fonts/mathfontSymbol.properties
-lib/%%APP_NAME%%/res/fonts/pangoFontEncoding.properties
+lib/%%APP_NAME%%/res/fonts/mathfontSTIXNonUnicode.properties
+lib/%%APP_NAME%%/res/fonts/mathfontSTIXSize1.properties
+lib/%%APP_NAME%%/res/fonts/mathfontStandardSymbolsL.properties
+lib/%%APP_NAME%%/res/fonts/mathfontUnicode.properties
 lib/%%APP_NAME%%/res/forms.css
 lib/%%APP_NAME%%/res/grabber.gif
 lib/%%APP_NAME%%/res/hiddenWindow.html
 lib/%%APP_NAME%%/res/html.css
-lib/%%APP_NAME%%/res/html/gopher-audio.gif
-lib/%%APP_NAME%%/res/html/gopher-binary.gif
-lib/%%APP_NAME%%/res/html/gopher-find.gif
-lib/%%APP_NAME%%/res/html/gopher-image.gif
-lib/%%APP_NAME%%/res/html/gopher-menu.gif
-lib/%%APP_NAME%%/res/html/gopher-movie.gif
-lib/%%APP_NAME%%/res/html/gopher-sound.gif
-lib/%%APP_NAME%%/res/html/gopher-telnet.gif
-lib/%%APP_NAME%%/res/html/gopher-text.gif
-lib/%%APP_NAME%%/res/html/gopher-unknown.gif
+lib/%%APP_NAME%%/res/html/folder.png
 lib/%%APP_NAME%%/res/langGroups.properties
 lib/%%APP_NAME%%/res/language.properties
 lib/%%APP_NAME%%/res/loading-image.gif
@@ -189,10 +205,11 @@ lib/%%APP_NAME%%/searchplugins/answers.xml
 lib/%%APP_NAME%%/searchplugins/creativecommons.xml
 lib/%%APP_NAME%%/searchplugins/eBay.xml
 lib/%%APP_NAME%%/searchplugins/google.xml
+lib/%%APP_NAME%%/searchplugins/wikipedia.xml
 lib/%%APP_NAME%%/searchplugins/yahoo.xml
+lib/%%APP_NAME%%/update.locale
 lib/%%APP_NAME%%/updater
 lib/%%APP_NAME%%/updater.ini
-lib/%%APP_NAME%%/xpicleanup
 @exec /bin/cp -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/plugins/  -depth 1 -type l -delete 2>/dev/null || true
@@ -207,18 +224,11 @@ lib/%%APP_NAME%%/xpicleanup
 @dirrm lib/%%APP_NAME%%/defaults/profile
 @dirrm lib/%%APP_NAME%%/defaults
 @dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/extensions/inspector@mozilla.org/chrome
-@dirrm lib/%%APP_NAME%%/extensions/inspector@mozilla.org/components
-@dirrm lib/%%APP_NAME%%/extensions/inspector@mozilla.org/defaults/preferences
-@dirrm lib/%%APP_NAME%%/extensions/inspector@mozilla.org/defaults
-@dirrm lib/%%APP_NAME%%/extensions/inspector@mozilla.org
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components/talkback
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org/components
-@dirrm lib/%%APP_NAME%%/extensions/talkback@mozilla.org
 @dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 @dirrm lib/%%APP_NAME%%/extensions
 @dirrm lib/%%APP_NAME%%/greprefs
 @dirrm lib/%%APP_NAME%%/icons
+@dirrm lib/%%APP_NAME%%/modules
 @dirrm lib/%%APP_NAME%%/plugins
 @dirrm lib/%%APP_NAME%%/res/dtd
 @dirrm lib/%%APP_NAME%%/res/entityTables