diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index c3551b3..1b715b6 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,6 @@
 DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
 DIST firefox-38.0-patches-05.tar.xz 18412 SHA256 d2a2be8359c15d42fd2355bb54048db88af2288f9f9b69acbd742c29bd10be16 SHA512 0556531fa5685bf04438df22b0e35ffd22c27e31a2d1d264b9401af8f3c79604577fc71f71e2bf338dc5465471152067ce1a30ba2813c612e062e20c4b5b7ea2 WHIRLPOOL cc9aa2174395c8a70a9fc7010fc48d2f4e35c64c73deda38934a42ded5def14f7ccf6c3be8700ab3bea02bdd93bb4b98b40ff44176e4cfccd0b68b70d9deed61
+DIST firefox-44.0-patches-0.4.tar.xz 14240 SHA256 cf17d24e19c8e64501582c77e010a10bf8cc65fc1d7620f7a8dd98706195eda0 SHA512 4f597f9885366a6ccbd7cf424fd68bc7d2377eeb5de4741b21d6f51272a9f4f6a57ff2b5a848593097e79d51a7ae7e6e261aea9155f4b3d719e74ebbdf7279f1 WHIRLPOOL 097eb79a5aba97f76d50f5f51da8b089c3d85b34c6a41d6ca782a85381f024d8865062d95ff4bb2235426e3806b660344d3ddf067da0889cda66f0b24cb97912
 DIST gdata-provider-1.9.tar.xz 80812 SHA256 8e60960999c752c49d6414d14c35c2d0cc474d4a199ec99e531453d4d60bc5a3 SHA512 b1411b0a8614eb5e9fbdc0a41eb5ed38e8d4c90832e2a356fd0412b554af46bde4b766b213d9da3cafd85206da44d333354c9f6b469c95ddb190fa04fe14a54a WHIRLPOOL df7451e55f937c604d92faed82a16bddd6ca87a7c03981324c5409ab5824ac1c631ec767f10eaedc6f7128cd1f9001eca599c848d39e116d9722f26811b01092
 DIST lightning-4.0.5.tar.xz 2312932 SHA256 8386208ecb915172a48d77fc758f5040933c13619c0f9d820903ce37ba610184 SHA512 9f1fbec0520d24158af78ffe8a790502fd2843facd17bac2e278006d7b1998067b5803e1fa2e3172511d298cebb4e0b7047edb7b0aa18a8dc4712d0f1e2e08d3 WHIRLPOOL 8f6074f6038fda3a4946ea8fe788194cb2eda0c7e4a6c68a7c349781b8acb7602a70baf66bd5148ebd712e197cf4974268b5f40cedec520280c355e4f03de701
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
@@ -60,3 +61,4 @@ DIST thunderbird-38.5.0-vi.xpi 519843 SHA256 43d25bbbf7d16c0d789ae2f98c16835b2ac
 DIST thunderbird-38.5.0-zh-CN.xpi 466412 SHA256 5a655ebd5fbba862542973834b4d6cc2f8a13c065f734bbc490f8d838d71dc6e SHA512 876e597c511721d3d83c74d1ad6cda7f73268ec7d5a91de312a11927986b9384886f42a2ac6ce0fb68fb0d9d7ce8aca081f5a90b116d5b9286ee3cbeaeac1a51 WHIRLPOOL 2d154a00f88ae784f4e51988d384f31bb18b2743f25ff78abb35f16f70ec6034598282467e43f105b41acd42fa11f2266c86645340fb9c537095cb4467ffb76e
 DIST thunderbird-38.5.0-zh-TW.xpi 466661 SHA256 87019d3d21edc402110fe3c18091f855e1946643b4e51392abecdd25ad775ffc SHA512 957bce9dd781e8b8aa17778e12c3335d0a3823bbf9f54a9ed4837ab724e27cc03feb6b7e1d2d85069a9ed2d480c9939c9f68bd3797d45f02c6d65bfabdd2f0ab WHIRLPOOL 4d79a8c4aa496c81af1751bb2830ed9e31886677a3b3aef58154cda37af7827ae355eb0a0de88a80ae765b071eb673e02c33851a65e21d41c8d9d5b25836e71a
 DIST thunderbird-38.5.0.source.tar.bz2 204393357 SHA256 7da187d4d5df17b1457bd93b584f78f5e41d2094f87c14e74ee9d8064de25d0d SHA512 fed8376375c3ad7df8b773ced7944fb07edbd28e82c907dc6451ad538b8944d6f2a1d5632399f255ab1c7f74a40a9170912fefdbb2fdf423d7dc35108d1baa65 WHIRLPOOL 93853218ce7bb585e1515e62ea02bbe51e723d0071f8bfcddd5da9c4ea0a888a5c78fe86afbd46ab049a2e59424dc5f2a04d3157ef720e524ad6e2bf99614e01
+DIST thunderbird-44.0b1.source.tar.xz 199016060 SHA256 335d2af71bd3767b643a09b558800ebf2182688f9e61fbf98b713a2b43fa418c SHA512 677119247061b6b89f781952c287d924fa77f841f6c67313808f5bfc9b7088322c22170a4981c5666b9f5b9779792f055394b18e077a1cbfc2076f2beddaf960 WHIRLPOOL b543f2fff5efdce908e4fe1b74485ce48c61cf494c69a716365a5d4fd0e97ab58bcf3f91c3a1690df4e27d1c1fcf5b99db4bf6c1ac1d710d8688acb449d02949
diff --git a/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch b/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch
new file mode 100644
index 0000000..ce892d6
--- /dev/null
+++ b/mail-client/thunderbird/files/musl/thunderbird-38.3.0-updater.patch
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User Felix Janda <felix.janda@posteo.de>
+# Date 1428142217 -7200
+#      Sat Apr 04 12:10:17 2015 +0200
+# Node ID c04cc88f3bb26e254356df6de06583a542ae6796
+# Parent  90adc073cbc6398f4fab9b1cd07b685368559f34
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1157850
+updater: no fts.h and MAXNAMLEN
+
+diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/common/updatedefines.h
+--- a/mozilla/toolkit/mozapps/update/common/updatedefines.h	Thu Apr 02 08:10:00 2015 -0400
++++ b/mozilla/toolkit/mozapps/update/common/updatedefines.h	Sat Apr 04 12:10:17 2015 +0200
+@@ -109,7 +109,7 @@
+ # include <sys/wait.h>
+ # include <unistd.h>
+ 
+-#ifdef SOLARIS
++#if 1
+ # include <sys/stat.h>
+ #else
+ # include <fts.h>
+diff -r 90adc073cbc6 -r c04cc88f3bb2 toolkit/mozapps/update/updater/updater.cpp
+--- a/mozilla/toolkit/mozapps/update/updater/updater.cpp	Thu Apr 02 08:10:00 2015 -0400
++++ b/mozilla/toolkit/mozapps/update/updater/updater.cpp	Sat Apr 04 12:10:17 2015 +0200
+@@ -3338,7 +3338,8 @@
+   return rv;
+ }
+ 
+-#elif defined(SOLARIS)
++#elif 1
++//#defined(SOLARIS)
+ int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
+ {
+   int rv = OK;
+@@ -3346,7 +3347,7 @@
+   NS_tchar foundpath[MAXPATHLEN];
+   struct {
+     dirent dent_buffer;
+-    char chars[MAXNAMLEN];
++    char chars[NAME_MAX];
+   } ent_buf;
+   struct dirent* ent;
+ 
diff --git a/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch b/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
new file mode 100644
index 0000000..4ecf95c
--- /dev/null
+++ b/mail-client/thunderbird/files/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
@@ -0,0 +1,116 @@
+Trim included libevent's hard-wired usage of sysctl as musl doesn't support it
+--- thunderbird-44.0b1/mozilla/ipc/chromium/src/third_party/libevent/arc4random.c.orig	2016-01-24 12:09:11.209680105 +0100
++++ thunderbird-44.0b1/mozilla/ipc/chromium/src/third_party/libevent/arc4random.c	2016-01-24 12:17:06.616663364 +0100
+@@ -58,9 +58,6 @@
+ #include <unistd.h>
+ #include <sys/param.h>
+ #include <sys/time.h>
+-#ifdef _EVENT_HAVE_SYS_SYSCTL_H
+-#include <sys/sysctl.h>
+-#endif
+ #endif
+ #include <limits.h>
+ #include <stdlib.h>
+@@ -167,85 +164,6 @@
+ }
+ #endif
+ 
+-#if defined(_EVENT_HAVE_SYS_SYSCTL_H) && defined(_EVENT_HAVE_SYSCTL)
+-#if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_RANDOM && _EVENT_HAVE_DECL_RANDOM_UUID
+-#define TRY_SEED_SYSCTL_LINUX
+-static int
+-arc4_seed_sysctl_linux(void)
+-{
+-	/* Based on code by William Ahern, this function tries to use the
+-	 * RANDOM_UUID sysctl to get entropy from the kernel.  This can work
+-	 * even if /dev/urandom is inaccessible for some reason (e.g., we're
+-	 * running in a chroot). */
+-	int mib[] = { CTL_KERN, KERN_RANDOM, RANDOM_UUID };
+-	unsigned char buf[ADD_ENTROPY];
+-	size_t len, n;
+-	unsigned i;
+-	int any_set;
+-
+-	memset(buf, 0, sizeof(buf));
+-
+-	for (len = 0; len < sizeof(buf); len += n) {
+-		n = sizeof(buf) - len;
+-
+-		if (0 != sysctl(mib, 3, &buf[len], &n, NULL, 0))
+-			return -1;
+-	}
+-	/* make sure that the buffer actually got set. */
+-	for (i=0,any_set=0; i<sizeof(buf); ++i) {
+-		any_set |= buf[i];
+-	}
+-	if (!any_set)
+-		return -1;
+-
+-	arc4_addrandom(buf, sizeof(buf));
+-	memset(buf, 0, sizeof(buf));
+-	arc4_seeded_ok = 1;
+-	return 0;
+-}
+-#endif
+-
+-#if _EVENT_HAVE_DECL_CTL_KERN && _EVENT_HAVE_DECL_KERN_ARND
+-#define TRY_SEED_SYSCTL_BSD
+-static int
+-arc4_seed_sysctl_bsd(void)
+-{
+-	/* Based on code from William Ahern and from OpenBSD, this function
+-	 * tries to use the KERN_ARND syscall to get entropy from the kernel.
+-	 * This can work even if /dev/urandom is inaccessible for some reason
+-	 * (e.g., we're running in a chroot). */
+-	int mib[] = { CTL_KERN, KERN_ARND };
+-	unsigned char buf[ADD_ENTROPY];
+-	size_t len, n;
+-	int i, any_set;
+-
+-	memset(buf, 0, sizeof(buf));
+-
+-	len = sizeof(buf);
+-	if (sysctl(mib, 2, buf, &len, NULL, 0) == -1) {
+-		for (len = 0; len < sizeof(buf); len += sizeof(unsigned)) {
+-			n = sizeof(unsigned);
+-			if (n + len > sizeof(buf))
+-			    n = len - sizeof(buf);
+-			if (sysctl(mib, 2, &buf[len], &n, NULL, 0) == -1)
+-				return -1;
+-		}
+-	}
+-	/* make sure that the buffer actually got set. */
+-	for (i=any_set=0; i<sizeof(buf); ++i) {
+-		any_set |= buf[i];
+-	}
+-	if (!any_set)
+-		return -1;
+-
+-	arc4_addrandom(buf, sizeof(buf));
+-	memset(buf, 0, sizeof(buf));
+-	arc4_seeded_ok = 1;
+-	return 0;
+-}
+-#endif
+-#endif /* defined(_EVENT_HAVE_SYS_SYSCTL_H) */
+-
+ #ifdef __linux__
+ #define TRY_SEED_PROC_SYS_KERNEL_RANDOM_UUID
+ static int
+@@ -340,16 +258,6 @@
+ 	if (0 == arc4_seed_proc_sys_kernel_random_uuid())
+ 		ok = 1;
+ #endif
+-#ifdef TRY_SEED_SYSCTL_LINUX
+-	/* Apparently Linux is deprecating sysctl, and spewing warning
+-	 * messages when you try to use it. */
+-	if (!ok && 0 == arc4_seed_sysctl_linux())
+-		ok = 1;
+-#endif
+-#ifdef TRY_SEED_SYSCTL_BSD
+-	if (0 == arc4_seed_sysctl_bsd())
+-		ok = 1;
+-#endif
+ 	return ok ? 0 : -1;
+ }
+ 
diff --git a/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch b/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
new file mode 100644
index 0000000..ec26160
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/mail/installer/package-manifest.in	2012-02-12 09:04:32.000000000 -0600
++++ b/mail/installer/package-manifest.in	2012-02-12 09:05:17.000000000 -0600
+@@ -336,6 +336,7 @@
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; default pref files
++@RESPATH@/defaults/pref/all-gentoo.js
+ @RESPATH@/defaults/pref/all-thunderbird.js
+ @RESPATH@/defaults/pref/channel-prefs.js
+ @RESPATH@/defaults/pref/composer.js
diff --git a/mail-client/thunderbird/thunderbird-44.0_beta1.ebuild b/mail-client/thunderbird/thunderbird-44.0_beta1.ebuild
new file mode 100644
index 0000000..1e59959
--- /dev/null
+++ b/mail-client/thunderbird/thunderbird-44.0_beta1.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+MOZ_ESR=""
+MOZ_LIGHTNING_VER="4.0.5"
+MOZ_LIGHTNING_GDATA_VER="1.9"
+
+# This list can be updated using scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs cy da de el en en-GB en-US es-AR
+es-ES et eu fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM id is it ja ko lt
+nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr
+uk vi zh-CN zh-TW )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}"
+# ESR releases have slightly version numbers
+if [[ ${MOZ_ESR} == 1 ]]; then
+	MOZ_PV="${MOZ_PV}esr"
+fi
+MOZ_P="${PN}-${MOZ_PV}"
+
+# Enigmail version
+EMVER="1.8.2"
+
+# Patches
+PATCHFF="firefox-44.0-patches-0.4"
+
+MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases"
+
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit flag-o-matic toolchain-funcs mozconfig-v6.44 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="bindist crypt hardened ldap lightning +minimal mozdom selinux"
+RESTRICT="!bindist? ( bindist )"
+
+# URI for upstream lightning package (when it is available)
+#${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+PATCH_URIS=( https://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/${PATCHFF}.tar.xz )
+SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.xz
+	lightning? (
+		https://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+		https://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
+	)
+	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	${PATCH_URIS[@]}"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND="
+	>=dev-libs/nss-3.19.2
+	>=dev-libs/nspr-4.10.10
+	!x11-plugins/enigmail
+	elibc_musl? ( sys-libs/queue )
+	crypt?  ( || (
+		( >=app-crypt/gnupg-2.1.8
+			|| (
+				app-crypt/pinentry[gtk]
+				app-crypt/pinentry[qt4]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	) )"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-thunderbird )
+"
+
+if [[ ${PV} =~ beta ]]; then
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+else
+	S="${WORKDIR}/comm-esr${PV%%.*}"
+fi
+
+BUILD_OBJ_DIR="${S}/tbird"
+
+pkg_setup() {
+	moz_pkgsetup
+
+	export MOZILLA_DIR="${S}/mozilla"
+
+	if ! use bindist ; then
+		elog "You are enabling official branding. You may not redistribute this build"
+		elog "to any users on your network or the internet. Doing so puts yourself into"
+		elog "a legal problem with Mozilla Foundation"
+		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
+		elog
+	fi
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	CHECKREQS_DISK_BUILD="4G"
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	# this version of lightning is a .tar.xz, no xpi needed
+	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+
+	# this version of gdata-provider is a .tar.xz , no xpi needed
+	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
+}
+
+src_prepare() {
+	# Apply our patchset from firefox to thunderbird as well
+	pushd "${S}"/mozilla &>/dev/null || die
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+	popd &>/dev/null || die
+
+	epatch "${FILESDIR}"/thunderbird-44.0_beta1-fix-preferences-gentoo.patch
+
+	## patches for building with musl libc
+	if use elibc_musl; then
+		epatch "${FILESDIR}"/musl/thunderbird-38.3.0-updater.patch		# bug 1157850, not fixed as of today
+		epatch "${FILESDIR}"/musl/thunderbird-44.0b1-remove-libevent-sysctl.patch
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/mail/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
+	eautoreconf
+	# Ensure we run eautoreconf in mozilla to regenerate configure
+	cd "${S}"/mozilla || die
+	eautoconf
+	cd "${S}"/mozilla/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+	mozconfig_annotate '' --enable-calendar
+
+	# Other tb-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --with-user-appdir=.thunderbird
+
+	mozconfig_use_enable ldap
+
+	mozlinguas_mozconfig
+
+	# Bug #72667
+	if use mozdom; then
+		MEXTENSIONS="${MEXTENSIONS},inspector"
+	fi
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	####################################
+	#
+	#  Configure and build
+	#
+	####################################
+
+	# Disable no-print-directory
+	MAKEOPTS=${MAKEOPTS/--no-print-directory/}
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	fi
+
+	if use crypt; then
+		pushd "${WORKDIR}"/enigmail &>/dev/null ||die
+		econf
+		popd &>/dev/null ||die
+	fi
+}
+
+src_compile() {
+	mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die
+
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake -f "${S}"/client.mk
+
+	# Only build enigmail extension if crypt enabled.
+	if use crypt ; then
+		einfo "Building enigmail"
+		pushd "${WORKDIR}"/enigmail &>/dev/null || die
+		emake -j1
+		emake -j1 xpi
+		popd &>/dev/null || die
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	declare emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Copy our preference before omnijar is created.
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install language packs
+	mozlinguas_src_install
+
+	if ! use bindist; then
+		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
+		domenu "${FILESDIR}"/icon/${PN}.desktop
+	else
+		newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png
+		newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \
+			${PN}.desktop
+
+		sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \
+			"${ED}"/usr/share/applications/${PN}.desktop
+	fi
+
+	local emid
+	# stage extra locales for lightning and install over existing
+	mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning \
+		"${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER} lightning calendar
+
+	emid='{e2fda1a4-762b-4020-b5ad-a41df1933103}'
+	mkdir -p "${T}/${emid}" || die
+	cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/lightning/* || die
+	insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+	doins -r "${T}/${emid}"
+
+	if use lightning; then
+		# move lightning out of distribution/extensions and into extensions for app-global install
+		mv "${ED}"/${MOZILLA_FIVE_HOME}/{distribution,}/extensions/${emid} || die
+
+		# stage extra locales for gdata-provider and install app-global
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider \
+			"${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}
+		emid='{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}'
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/gdata-provider/* || die
+		insinto ${MOZILLA_FIVE_HOME}/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	if use crypt ; then
+		local enigmail_xpipath="${WORKDIR}/enigmail/build"
+		cd "${T}" || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+
+		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+		unzip "${enigmail_xpipath}"/enigmail*.xpi || die
+	fi
+
+	# Required in order for jit to work on hardened, for mozilla-31 and above
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
+
+	# Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash
+	# continue to work as expected.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+
+	if use minimal; then
+		rm -r "${ED}"/usr/include "${ED}"${MOZILLA_FIVE_HOME}/{idl,include,lib,sdk} || \
+			die "Failed to remove sdk and headers"
+	fi
+
+	# workaround to make thunderbird find libmozalloc.so on musl
+	into /
+	echo "LDPATH=${MOZILLA_FIVE_HOME}" > "${T}"/20thunderbird
+	doenvd "${T}"/20thunderbird || die
+
+}
+
+pkg_postinst() {
+	if use crypt; then
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gtk*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+			ewarn "You may be prompted for your password in an inaccessible shell!!"
+			ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+			;;
+		esac
+	fi
+	elog
+	elog "If you experience problems with plugins please issue the"
+	elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ,"
+	elog "then restart thunderbird"
+	if ! use lightning; then
+		elog
+		elog "If calendar fails to show up in extensions please open config editor"
+		elog "and set extensions.lastAppVersion to 38.0.0 to force a reload. If this"
+		elog "fails to show the calendar extension after restarting with above change"
+		elog "please file a bug report."
+	fi
+}