diff --git a/suite/installer/Makefile.in b/suite/installer/Makefile.in
index 73ae7087c19..027127fa0d3 100644
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -52,6 +52,10 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 ifeq (WINNT,$(OS_ARCH))
 MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages
+else
+ifneq (,$(filter-out OS2 Darwin,$(OS_ARCH)))
+MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages
+endif
 endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
@@ -73,7 +77,7 @@ MOZ_OPTIONAL_PKG_LIST = \
 	venkman \
 	$(NULL)
 
-DEFINES += -DAB_CD=$(AB_CD)
+DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME)
 
 ifdef MOZ_PKG_MANIFEST_P
 MOZ_PKG_MANIFEST = packages
diff --git a/suite/installer/removed-files.in b/suite/installer/removed-files.in
index 1cf611de217..e0b338e7e77 100644
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -16,9 +16,11 @@ extensions/talkback@mozilla.org/components/talkback.hlp
 extensions/talkback@mozilla.org/InstallDisabled
 #endif
 components/airbag.xpt
+components/@DLL_PREFIX@bookmark@DLL_SUFFIX@
+components/bookmarks.xpt
 components/nsCloseAllWindows.js
 components/nsKillAll.js
 components/search.xpt
-components/srchsvc.dll
+components/@DLL_PREFIX@srchsvc@DLL_SUFFIX@
 components/urlwidgt.xpt
 components/venkman-service.js
diff --git a/suite/installer/unix/packages b/suite/installer/unix/packages
new file mode 100644
index 00000000000..18c9365f55d
--- /dev/null
+++ b/suite/installer/unix/packages
@@ -0,0 +1,508 @@
+; Package file for Linux static SeaMonkey build.
+;
+; File format:
+;
+; [] designates a toplevel component. Example: [xpcom]
+; - in front of a file specifies it to be removed from the destination
+; * wildcard support to recursively copy the entire directory
+; ; file comment
+;
+
+#filter substitution
+
+bin/.autoreg
+
+[@AB_CD@]
+bin/chrome/@AB_CD@.jar
+bin/chrome/@AB_CD@.manifest
+bin/chrome/@AB_CD@/*
+bin/defaults/messenger/@AB_CD@/mailViews.dat
+bin/defaults/messenger/mailViews.dat
+bin/defaults/profile/bookmarks.html
+bin/defaults/profile/localstore.rdf
+bin/defaults/profile/mimeTypes.rdf
+bin/defaults/profile/panels.rdf
+bin/defaults/profile/search.rdf
+bin/defaults/profile/chrome/*
+bin/dictionaries/*
+bin/searchplugins/*
+
+[xpcom]
+bin/libmozjs.so
+bin/libmozlcms.so
+bin/libmozz.so
+bin/libplc4.so
+bin/libplds4.so
+bin/libthebes.so
+bin/libxpcom.so
+bin/libxpcom_core.so
+bin/libxpistub.so
+bin/libnspr4.so
+bin/libxul.so
+bin/components/libxpinstall.so
+bin/components/libjar50.so
+
+[browser]
+bin/@MOZ_APP_NAME@-bin
+bin/@MOZ_APP_NAME@
+bin/application.ini
+bin/LICENSE
+bin/mozilla-xremote-client
+bin/platform.ini
+bin/plugins/libnullplugin.so
+bin/README
+bin/res/cmessage.txt
+bin/res/effective_tld_names.dat
+bin/run-mozilla.sh
+bin/xpicleanup
+
+; shared libraries
+bin/libgfxpsshar.so
+bin/libgkgfx.so
+bin/libgtkxtbin.so
+bin/libjsj.so
+bin/libsqlite3.so
+
+; Components
+bin/components/libaccessibility.so
+bin/components/accessibility.xpt
+bin/components/alerts.xpt
+bin/components/libappcomps.so
+bin/components/appshell.xpt
+bin/components/libnsappshell.so
+bin/components/appstartup.xpt
+bin/components/autocomplete.xpt
+bin/components/libautoconfig.so
+bin/components/autoconfig.xpt
+bin/components/libcaps.so
+bin/components/caps.xpt
+bin/components/chardet.xpt
+bin/components/libchardet.so
+bin/components/chrome.xpt
+bin/components/libchrome.so
+bin/components/commandhandler.xpt
+bin/components/commandlines.xpt
+bin/components/libcommandlines.so
+bin/components/libcomposer.so
+bin/components/composer.xpt
+bin/components/content_base.xpt
+bin/components/content_html.xpt
+bin/components/content_htmldoc.xpt
+bin/components/content_xmldoc.xpt
+bin/components/content_xslt.xpt
+bin/components/content_xtf.xpt
+bin/components/contentprefs.xpt
+bin/components/libcookie.so
+bin/components/cookie.xpt
+bin/components/crashreporter.xpt
+bin/components/directory.xpt
+bin/components/libdocshell.so
+bin/components/docshell.xpt
+bin/components/dom.xpt
+bin/components/dom_base.xpt
+bin/components/dom_canvas.xpt
+bin/components/dom_core.xpt
+bin/components/dom_css.xpt
+bin/components/dom_events.xpt
+bin/components/dom_html.xpt
+bin/components/dom_loadsave.xpt
+bin/components/dom_offline.xpt
+bin/components/dom_range.xpt
+bin/components/dom_sidebar.xpt
+bin/components/dom_storage.xpt
+bin/components/dom_stylesheets.xpt
+bin/components/dom_svg.xpt
+bin/components/dom_traversal.xpt
+bin/components/dom_views.xpt
+bin/components/dom_xbl.xpt
+bin/components/dom_xpath.xpt
+bin/components/dom_xul.xpt
+bin/components/downloadmanager.xpt
+bin/components/editor.xpt
+bin/components/embed_base.xpt
+bin/components/libembedcomponents.so
+bin/components/extensions.xpt
+bin/components/exthandler.xpt
+bin/components/fastfind.xpt
+bin/components/feeds.xpt
+bin/components/filepicker.xpt
+bin/components/libfileview.so
+bin/components/find.xpt
+bin/components/gfx.xpt
+bin/components/libgkgfxthebes.so
+bin/components/history.xpt
+bin/components/htmlparser.xpt
+bin/components/libgklayout.so
+bin/components/libgkplugin.so
+bin/components/libhtmlpars.so
+bin/components/libi18n.so
+bin/components/libimgicon.so
+bin/components/imgicon.xpt
+bin/components/libimglib2.so
+bin/components/imglib2.xpt
+bin/components/inspector.xpt
+bin/components/intl.xpt
+bin/components/libintlapp.so
+bin/components/jar.xpt
+bin/components/libjsd.so
+bin/components/jsdservice.xpt
+bin/components/layout_base.xpt
+bin/components/layout_printing.xpt
+bin/components/layout_xul.xpt
+bin/components/layout_xul_tree.xpt
+bin/components/locale.xpt
+bin/components/loginmgr.xpt
+bin/components/lwbrk.xpt
+bin/components/mimetype.xpt
+bin/components/libmork.so
+bin/components/mozbrwsr.xpt
+bin/components/libmozfind.so
+bin/components/mozfind.xpt
+bin/components/libnecko.so
+bin/components/necko.xpt
+bin/components/necko_about.xpt
+bin/components/necko_cache.xpt
+bin/components/necko_cookie.xpt
+bin/components/necko_dns.xpt
+bin/components/necko_file.xpt
+bin/components/necko_ftp.xpt
+bin/components/necko_http.xpt
+bin/components/necko_res.xpt
+bin/components/necko_socket.xpt
+bin/components/necko_strconv.xpt
+bin/components/necko_viewsource.xpt
+bin/components/liboji.so
+bin/components/oji.xpt
+bin/components/libpermissions.so
+bin/components/plugin.xpt
+bin/components/libpref.so
+bin/components/pref.xpt
+bin/components/prefetch.xpt
+bin/components/profile.xpt
+bin/components/proxyObjInst.xpt
+bin/components/libremoteservice.so
+bin/components/librdf.so
+bin/components/rdf.xpt
+bin/components/related.xpt
+bin/components/libsatchel.so
+bin/components/libspellchecker.so
+bin/components/satchel.xpt
+bin/components/saxparser.xpt
+bin/components/shistory.xpt
+bin/components/signonviewer.xpt
+bin/components/spellchecker.xpt
+bin/components/storage.xpt
+bin/components/libstoragecomps.so
+bin/components/libsuite.so
+bin/components/suitebrowser.xpt
+bin/components/suitemigration.xpt
+bin/components/suitetypeaheadfind.xpt
+bin/components/libsystem-pref.so
+bin/components/libsuitetypeaheadfind.so
+bin/components/libtkautocomplete.so
+bin/components/libtoolkitcomps.so
+bin/components/toolkitprofile.xpt
+bin/components/toolkitremote.xpt
+bin/components/libtxmgr.so
+bin/components/txmgr.xpt
+bin/components/txtsvc.xpt
+bin/components/libuconv.so
+bin/components/uconv.xpt
+bin/components/unicharutil.xpt
+bin/components/libucvmath.so
+bin/components/libuniversalchardet.so
+bin/components/update.xpt
+bin/components/uriloader.xpt
+bin/components/urlformatter.xpt
+bin/components/libwallet.so
+bin/components/libwalletviewers.so
+bin/components/wallet.xpt
+bin/components/walleteditor.xpt
+bin/components/walletpreview.xpt
+bin/components/webBrowser_core.xpt
+bin/components/webbrowserpersist.xpt
+bin/components/libwebbrwsr.so
+bin/components/webshell_idls.xpt
+bin/components/widget.xpt
+bin/components/libwidget_gtk2.so
+bin/components/libwindowds.so
+bin/components/windowds.xpt
+bin/components/windowwatcher.xpt
+bin/components/libxmlextras.so
+bin/components/xml-rpc.xpt
+bin/components/libxpautocomplete.so
+bin/components/xpautocomplete.xpt
+bin/components/xpcom_base.xpt
+bin/components/xpcom_components.xpt
+bin/components/xpcom_ds.xpt
+bin/components/xpcom_io.xpt
+bin/components/xpcom_system.xpt
+bin/components/xpcom_threads.xpt
+bin/components/xpcom_xpti.xpt
+bin/components/xpconnect.xpt
+bin/components/libxpconnect.so
+bin/components/xpinstall.xpt
+bin/components/xulapp.xpt
+bin/components/xuldoc.xpt
+bin/components/xultmpl.xpt
+
+; JavaScript components
+bin/components/FeedProcessor.js
+bin/components/jsconsole-clhandler.js
+bin/components/nsAboutAbout.js
+bin/components/nsBlocklistService.js
+bin/components/nsBrowserContentHandler.js
+bin/components/nsComposerCmdLineHandler.js
+bin/components/nsContentDispatchChooser.js
+bin/components/nsContentPrefService.js
+bin/components/nsDefaultCLH.js
+bin/components/nsDictionary.js
+bin/components/nsDownloadProgressListener.js
+bin/components/nsExtensionManager.js
+bin/components/nsFilePicker.js
+bin/components/nsLoginInfo.js
+bin/components/nsLoginManager.js
+bin/components/nsLoginManagerPrompter.js
+bin/components/nsHandlerService.js
+bin/components/nsHelperAppDlg.js
+bin/components/nsProgressDialog.js
+bin/components/nsProxyAutoConfig.js
+bin/components/nsResetPref.js
+bin/components/nsScriptableIO.js
+bin/components/nsSidebar.js
+bin/components/nsTryToClose.js
+bin/components/nsUpdateService.js
+bin/components/nsURLFormatter.js
+bin/components/nsWebHandlerApp.js
+bin/components/nsXmlRpcClient.js
+bin/components/pluginGlue.js
+bin/components/storage-Legacy.js
+bin/components/txEXSLTRegExFunctions.js
+
+; Modules
+bin/modules/*
+
+; Safe Browsing
+
+; Kerberos NegotiateAuth
+bin/components/libauth.so
+
+; GNOME hooks
+bin/components/libmozgnome.so
+
+; Browser Chrome Files
+bin/chrome/comm.jar
+bin/chrome/comm.manifest
+bin/chrome/icons/default/bmPropsWindow.xpm
+bin/chrome/icons/default/bmPropsWindow16.xpm
+bin/chrome/icons/default/bookmark-window.xpm
+bin/chrome/icons/default/bookmark-window16.xpm
+bin/chrome/icons/default/default.xpm
+bin/chrome/icons/default/default16.xpm
+bin/chrome/icons/default/downloadManager.xpm
+bin/chrome/icons/default/downloadManager16.xpm
+bin/chrome/icons/default/editorWindow.xpm
+bin/chrome/icons/default/editorWindow16.xpm
+bin/chrome/icons/default/findBookmarkWindow.xpm
+bin/chrome/icons/default/findBookmarkWindow16.xpm
+bin/chrome/icons/default/findHistoryWindow.xpm
+bin/chrome/icons/default/findHistoryWindow16.xpm
+bin/chrome/icons/default/history-window.xpm
+bin/chrome/icons/default/history-window16.xpm
+bin/chrome/icons/default/jsconsoleWindow.xpm
+bin/chrome/icons/default/jsconsoleWindow16.xpm
+bin/chrome/icons/default/main-window.xpm
+bin/chrome/icons/default/main-window16.xpm
+bin/chrome/icons/default/seamonkey.png
+; Although venkman-window is an extension, its icon is still suite-specific
+bin/chrome/icons/default/venkman-window.xpm
+bin/chrome/icons/default/venkman-window16.xpm
+bin/chrome/installed-chrome.txt
+bin/chrome/toolkit.jar
+bin/chrome/toolkit.manifest
+
+; classic theme
+bin/chrome/classic.jar
+bin/chrome/classic.manifest
+bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+
+; modern theme
+bin/extensions/modern@themes.mozilla.org/chrome/modern.jar
+bin/extensions/modern@themes.mozilla.org/chrome.manifest
+bin/extensions/modern@themes.mozilla.org/icon.png
+bin/extensions/modern@themes.mozilla.org/install.rdf
+bin/extensions/modern@themes.mozilla.org/preview.png
+
+; Default Preferences
+; All the pref files must be part of base to prevent migration bugs
+bin/defaults/autoconfig/*
+bin/defaults/pref/*
+bin/greprefs/*
+
+; Wallet schemas
+bin/defaults/wallet/VcardSchema.tbl
+bin/defaults/wallet/FieldSchema.tbl
+bin/defaults/wallet/SchemaConcat.tbl
+bin/defaults/wallet/DistinguishedSchema.tbl
+bin/defaults/wallet/SchemaStrings.tbl
+bin/defaults/wallet/PositionalSchema.tbl
+bin/defaults/wallet/StateSchema.tbl
+
+; LDAP components need to be in the browser for AutoConfig
+bin/libldap60.so
+bin/libldif60.so
+bin/libprldap60.so
+bin/components/libmozldap.so
+bin/components/mozldap.xpt
+
+; [Layout Engine Resources]
+; Style Sheets, Graphics and other Resources used by the layout engine.
+bin/res/arrow.gif
+bin/res/arrowd.gif
+bin/res/broken-image.gif
+bin/res/charsetalias.properties
+bin/res/charsetData.properties
+bin/res/contenteditable.css
+bin/res/dtd/*
+bin/res/designmode.css
+bin/res/EditorOverride.css
+bin/res/entityTables/*
+bin/res/fonts/*
+bin/res/forms.css
+bin/res/grabber.gif
+bin/res/hiddenWindow.html
+bin/res/html.css
+bin/res/html/*
+bin/res/langGroups.properties
+bin/res/language.properties
+bin/res/loading-image.gif
+bin/res/mathml.css
+bin/res/quirk.css
+bin/res/svg.css
+bin/res/table-add-column-after-active.gif
+bin/res/table-add-column-after-hover.gif
+bin/res/table-add-column-after.gif
+bin/res/table-add-column-before-active.gif
+bin/res/table-add-column-before-hover.gif
+bin/res/table-add-column-before.gif
+bin/res/table-add-row-after-active.gif
+bin/res/table-add-row-after-hover.gif
+bin/res/table-add-row-after.gif
+bin/res/table-add-row-before-active.gif
+bin/res/table-add-row-before-hover.gif
+bin/res/table-add-row-before.gif
+bin/res/table-remove-column-active.gif
+bin/res/table-remove-column-hover.gif
+bin/res/table-remove-column.gif
+bin/res/table-remove-row-active.gif
+bin/res/table-remove-row-hover.gif
+bin/res/table-remove-row.gif
+bin/res/ua.css
+bin/res/unixcharset.properties
+bin/res/viewsource.css
+
+; Personal Security Manager
+bin/libnssckbi.so
+bin/components/libpipboot.so
+bin/components/pipboot.xpt
+bin/components/libpipnss.so
+bin/components/pipnss.xpt
+bin/components/libpippki.so
+bin/components/pippki.xpt
+
+bin/libnss3.so
+bin/libsmime3.so
+bin/libsoftokn3.chk
+bin/libsoftokn3.so
+bin/libfreebl3.chk
+bin/libfreebl3.so
+bin/libssl3.so
+bin/libnssdbm3.so
+bin/chrome/pippki.jar
+bin/chrome/pippki.manifest
+
+; for Solaris SPARC
+bin/libfreebl_32fpu_3.chk
+bin/libfreebl_32fpu_3.so
+bin/libfreebl_32int_3.chk
+bin/libfreebl_32int_3.so
+bin/libfreebl_32int64_3.chk
+bin/libfreebl_32int64_3.so
+
+; Crash Reporter
+bin/crashreporter
+bin/crashreporter.ini
+
+; Extensions
+bin/components/libnkgnomevfs.so
+
+[mail]
+bin/chrome/icons/default/abcardWindow.xpm
+bin/chrome/icons/default/abcardWindow16.xpm
+bin/chrome/icons/default/addressbookWindow.xpm
+bin/chrome/icons/default/addressbookWindow16.xpm
+bin/chrome/icons/default/messengerWindow.xpm
+bin/chrome/icons/default/messengerWindow16.xpm
+bin/chrome/icons/default/msgcomposeWindow.xpm
+bin/chrome/icons/default/msgcomposeWindow16.xpm
+bin/chrome/messenger.jar
+bin/chrome/messenger.manifest
+bin/chrome/messenger/*
+bin/components/addrbook.xpt
+bin/components/libimport.so
+bin/components/import.xpt
+bin/components/impComm4xMail.xpt
+bin/components/mailnews.xpt
+bin/components/mailview.xpt
+bin/components/libmail.so
+bin/components/mime.xpt
+bin/components/msgbase.xpt
+bin/components/msgcompose.xpt
+bin/components/msgdb.xpt
+bin/components/msgimap.xpt
+bin/components/msglocal.xpt
+bin/components/msgnews.xpt
+bin/components/msgsearch.xpt
+bin/components/libmsgsmime.so
+bin/components/msgsmime.xpt
+bin/components/nsAbLDAPAttributeMap.js
+bin/components/nsLDAPPrefsService.js
+bin/components/smime-service.js
+bin/components/mdn-service.js
+bin/components/offlineStartup.js
+
+bin/isp/SpamAssassin.sfd
+bin/isp/SpamPal.sfd
+
+[chatzilla]
+bin/components/chatzilla-service.js
+bin/chrome/chatzilla.jar
+bin/chrome/chatzilla/*
+bin/chrome/icons/default/chatzilla-window.xpm
+bin/chrome/icons/default/chatzilla-window16.xpm
+
+[venkman]
+bin/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/components/venkman-service.js
+bin/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome/venkman.jar
+bin/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/chrome.manifest
+bin/extensions/{f13b157f-b174-47e7-a34d-4815ddfdfeb8}/install.rdf
+
+[inspector]
+bin/extensions/inspector@mozilla.org/install.rdf
+bin/extensions/inspector@mozilla.org/chrome.manifest
+bin/extensions/inspector@mozilla.org/chrome/inspector.jar
+bin/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain16.xpm
+bin/extensions/inspector@mozilla.org/platform/Linux/chrome/icons/default/winInspectorMain.xpm
+bin/extensions/inspector@mozilla.org/components/inspector-cmdline.js
+bin/extensions/inspector@mozilla.org/defaults/preferences/inspector.js
+
+[reporter]
+bin/chrome/reporter.jar
+bin/chrome/reporter.manifest
+
+[debugqa]
+bin/extensions/debugQA@mozilla.org/install.rdf
+bin/extensions/debugQA@mozilla.org/chrome.manifest
+bin/extensions/debugQA@mozilla.org/chrome/debugqa.jar