diff --git a/www-client/firefox-developer-bin/Manifest b/www-client/firefox-developer-bin/Manifest
new file mode 100644
index 0000000..e87a748
--- /dev/null
+++ b/www-client/firefox-developer-bin/Manifest
@@ -0,0 +1,9 @@
+AUX 10firefox-bin 32 SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 SHA512 24f2c370316540b70b2053e2ac0c8ca67714c928d570c9df9dbeb3b179f29b78e7f6dbdad6e452ef312b796f68f4d7105c92f027e75a56f07084ea9ccb58ab69 WHIRLPOOL ad74d82fb1c9c17cc7b7a5a59dd2a27e0fba26c551cc3127066ddda0b9298a37a14bbaf0a3c4c4fce45aed82e7334a0458851c032fcafdc3fb51eca27d550acc
+AUX all-gentoo-1-cve-2015-4000.js 656 SHA256 006cd05bc1c36fabee3fc20e0d92e8c47ea1dc17e5fd72e138bb98467af84167 SHA512 44a946a301586112f1c2975b8af4cd72dadf7f5d2dd2593d565ea02cc200a1274da55a5025aac71fcac38115318c25e9331da9a112f39652e2e118f11b978c6b WHIRLPOOL 8204decb375b5b48e418b6342c91a86dad2121a4f7334b4e1fe5025a5ddd9635d1559f5363ed3886b0701528301e6a6eeea9fd4636968e5ef7a133b64274c199
+AUX all-gentoo-1.js 501 SHA256 a164c86c6904f483dadd4a246631645c390d2c9a56a4509c15f8f0e48ac61c6d SHA512 417faf0f24f679321f68990506161bf1df6a2fdd11ecc7ad501bcc6719a7fcff186f9e9ebaa4c0690d4365e4002f582661d5ce56ccd72531cf61dea6a9f9d740 WHIRLPOOL 51631d591042ee7ce1fc2a3449fcab13d99a864282463c196fbf127911befb903839bec1c67f377246bd2a1fc35a2450ae55ed0b5f32159f1e1fdeac7cd5eae5
+AUX all-gentoo.js 282 SHA256 96e0361989f2fb457ac757c9c28345ca257ee5628a0ba7ee47c10beaabd3440b SHA512 afe6bb385892bbebef21d13f97e233daf2fdbe0d1772049f443a5b8c19c6d707e5562f0277ccdee5fa9aed68720f7eb062907855a7114cbd2abe58dc2444b607 WHIRLPOOL 8fd6182ecf00d6b31e3c21b1efd5c43add839ecf36498bed6ad7b3ecae5222599cff3b4fc063ddeb829f689fd9e555913f6dc869ac78138468972c62807fff34
+AUX firefox-bin-prefs.js 305 SHA256 786fbfc99425ed9ba32d3e99af6b482226539a86e762197cc10e2b491c7b9d72 SHA512 ef65b9a24f22cf04def4962721056869392dddabdac80e6f9cd92c57d58174667475ae55d83fa43603e93dcb1745568d82bcad8c810fb597dd51f2b5099bd69e WHIRLPOOL e19e8e1d4820b8356103ecd358f2e455ca00f6ed59eba6996a032cf97bcd5d3d1af9624e69eb68dbe3e2d4208e1d14e0355407194d9230098b1a118c213ef97d
+AUX firefox-developer-bin.desktop 369 SHA256 b841afdc60d859bb2e9c904d6003706f9d7b68ea9f22a261d4b3375cc927424d SHA512 1a4cfd9c44bc534d21dd1651ecdff6b07dd8cd4ee765f80df6f77cdb8c5445faa555407f83940d7d2f28d3a4eab78172fb7ce7c46cdf0ee9d54bb64b7a7b2c19 WHIRLPOOL c65ad8d3dedccffc307d04393be71f7071439700607d3fd1aa8b5e17376a8da4efd6dba8c5c6ed19c1280d89dedc895cd287452356a4048e5192351149da7d48
+AUX local-settings.js 129 SHA256 1ee0688c9b936b7cc92dc445577bccdad3d30a8453c6c7bd391391b00a8b09a7 SHA512 2ae80875251d0ea322acb64370a0077b10f2e2c8bd258cd4792c6cf7152c0a6f8786353167d71fc99607b5f15142af28eb565483a3115b25c2f040c06319ba6c WHIRLPOOL c71ca7760db187726cebc006af3c538b6a41b5802959426d954e8c6d7b151b9d26c95e0bcb30b0c478c704591e6090c9055ef7f9e1a93f1d5e8ce05aec886f8b
+DIST firefox-developer-bin_x86_64-54.0_alpha2.tar.bz2 66641284 SHA256 6bc891565dba042b0c2538fbd4310c6a7af0372ebb75a59f095e89a74c64a5cc SHA512 4c0e4443885e7600e4479f8472145085bf43fd9353d343e4e1c1a63153b5503753fc483482e847ceb97f979dfd3a93e15c90d78a18b516379c12a1f0f27db2bb WHIRLPOOL c79de10dfdd4009dca2dff0095d0bf7f108ed2f13becd9a0725bd9d12c206534ba19f554cf673464976ec1b7e38bf2e99f1f2bc01b92b9b0ca64c0e585cc55ba
+EBUILD firefox-developer-bin-54.0_alpha2.ebuild 4822 SHA256 35dc59490fd6f754c5931dfec79bd1931c9436af0be12e998eddfb0c69fdae6b SHA512 df8b1243fbdd69be32bff9f553952c98ed95bc1a0b1e38a8671421e5e4e7c9fc93d29c0cdaa54c51010979f764f3b961ba0842bd34eff4db7bf8c80334a999f6 WHIRLPOOL d409da75f0123d9bec8bcb29a724b226ff1f84c7d991aafa9243f6ea48082fd05e0bbcbc8f46fc97fac8f7d198b4333b0e12d07ee86dc5c0c290514640aa3bfd
diff --git a/www-client/firefox-developer-bin/files/10firefox-bin b/www-client/firefox-developer-bin/files/10firefox-bin
new file mode 100644
index 0000000..6e0709e
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/10firefox-bin
@@ -0,0 +1 @@
+SEARCH_DIRS_MASK="/opt/firefox"
diff --git a/www-client/firefox-developer-bin/files/all-gentoo-1-cve-2015-4000.js b/www-client/firefox-developer-bin/files/all-gentoo-1-cve-2015-4000.js
new file mode 100644
index 0000000..0cda361
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/all-gentoo-1-cve-2015-4000.js
@@ -0,0 +1,13 @@
+// Ensure preference cann't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+lockPref("intl.locale.matchOS",                true);
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors",  true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
+defaultPref("browser.shell.checkDefaultBrowser",  false); 
+// Preferences that should be reset every session
+pref("browser.EULA.override",              true); 
+// CVE-2015-4000 - prevent Logjam attack vector
+lockPref("security.ssl3.dhe_rsa_aes_128_sha", false);
+lockPref("security.ssl3.dhe_rsa_aes_256_sha", false);
diff --git a/www-client/firefox-developer-bin/files/all-gentoo-1.js b/www-client/firefox-developer-bin/files/all-gentoo-1.js
new file mode 100644
index 0000000..0ac6d6a
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/all-gentoo-1.js
@@ -0,0 +1,11 @@
+// Ensure preference cann't be changed by users
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+lockPref("intl.locale.matchOS",                true);
+// Allow user to change based on needs
+defaultPref("browser.display.use_system_colors",  true);
+defaultPref("spellchecker.dictionary_path", "/usr/share/myspell");
+defaultPref("browser.shell.checkDefaultBrowser",  false); 
+// Preferences that should be reset every session
+pref("browser.EULA.override",              true); 
+
diff --git a/www-client/firefox-developer-bin/files/all-gentoo.js b/www-client/firefox-developer-bin/files/all-gentoo.js
new file mode 100644
index 0000000..a9b016c
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/all-gentoo.js
@@ -0,0 +1,8 @@
+//
+lockPref("app.update.auto", false);
+lockPref("app.update.enabled", false);
+
+pref("browser.display.use_system_colors",  true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("intl.locale.matchOS",                true);
diff --git a/www-client/firefox-developer-bin/files/firefox-bin-prefs.js b/www-client/firefox-developer-bin/files/firefox-bin-prefs.js
new file mode 100644
index 0000000..c40cec5
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/firefox-bin-prefs.js
@@ -0,0 +1,6 @@
+pref("app.update.enabled",                 false);
+pref("app.update.autoInstallEnabled",      false);
+pref("browser.display.use_system_colors",  true);
+pref("browser.shell.checkDefaultBrowser",  false); 
+pref("browser.EULA.override",              true); 
+pref("intl.locale.matchOS",                true);
diff --git a/www-client/firefox-developer-bin/files/firefox-developer-bin.desktop b/www-client/firefox-developer-bin/files/firefox-developer-bin.desktop
new file mode 100644
index 0000000..52c0dba
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/firefox-developer-bin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mozilla Firefox Developer Edition (bin)
+Comment=Mozilla Firefox Developer Edition
+Exec=/usr/bin/firefox-developer-bin %u
+Icon=firefox-developer-bin
+Terminal=false
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
+Categories=Network;WebBrowser;
diff --git a/www-client/firefox-developer-bin/files/local-settings.js b/www-client/firefox-developer-bin/files/local-settings.js
new file mode 100644
index 0000000..9dac3b0
--- /dev/null
+++ b/www-client/firefox-developer-bin/files/local-settings.js
@@ -0,0 +1,2 @@
+pref("general.config.filename", "all-gentoo.js");
+pref("general.config.obscure_value", 0); // use this to disable the byte-shift
diff --git a/www-client/firefox-developer-bin/firefox-developer-bin-54.0_alpha2.ebuild b/www-client/firefox-developer-bin/firefox-developer-bin-54.0_alpha2.ebuild
new file mode 100644
index 0000000..9e07a3f
--- /dev/null
+++ b/www-client/firefox-developer-bin/firefox-developer-bin-54.0_alpha2.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=( en de )
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PN="${PN/-developer-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+MOZ_HTTP_URI="http://archive.mozilla.org/pub/${MOZ_PN}/nightly/latest-mozilla-aurora/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas-v2 nsplugins
+
+DESCRIPTION="Firefox Developer Edition"
+SRC_URI="${MOZ_HTTP_URI%/}/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror"
+
+KEYWORDS="-* ~amd64"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="selinux startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/atk
+	>=sys-apps/dbus-0.60
+	>=dev-libs/dbus-glib-0.72
+	>=dev-libs/glib-2.26:2
+	>=media-libs/alsa-lib-1.0.16
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/pango-1.22.0
+	virtual/freedesktop-icon-theme
+	selinux? ( sec-policy/selinux-mozilla )
+"
+
+QA_PREBUILT="
+	opt/${PN}/*.so
+	opt/${PN}/${MOZ_PN}
+	opt/${PN}/${PN}
+	opt/${PN}/crashreporter
+	opt/${PN}/webapprt-stub
+	opt/${PN}/plugin-container
+	opt/${PN}/mozilla-xremote-client
+	opt/${PN}/updater
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${PN}
+
+	local size sizes icon_path icon name
+	sizes="16 32 48"
+	icon_path="${S}/browser/chrome/icons/default"
+	icon="${PN}"
+	name="Mozilla Firefox Developer Edition"
+
+	# Install icons and .desktop for menu entry
+	for size in ${sizes}; do
+		insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
+		newins "${icon_path}/default${size}.png" "${icon}.png" || die
+	done
+	# The 128x128 icon has a different name
+	insinto /usr/share/icons/hicolor/128x128/apps
+	newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+	# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
+	newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \
+		"${ED}usr/share/applications/${PN}.desktop" || die
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${ED}"usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${ED}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/local-settings.js
+	# Copy preferences file so we can do a simple rename.
+	cp "${FILESDIR}"/all-gentoo-1.js \
+		"${ED}"${MOZILLA_FIVE_HOME}/all-gentoo.js || die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${ED}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${ED}"usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox-developer-bin/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	einfo "For HTML5 video you need media-video/ffmpeg installed."
+
+	# Drop requirement of curl not built with nss as it's not necessary anymore
+	#if has_version 'net-misc/curl[nss]'; then
+	#	einfo
+	#	einfo "Crashreporter won't be able to send reports"
+	#	einfo "if you have curl emerged with the nss USE-flag"
+	#	einfo
+	#fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}