diff --git a/www-client/mozilla-firefox-bin/Manifest b/www-client/mozilla-firefox-bin/Manifest
new file mode 100644
index 0000000..a421bb1
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/Manifest
@@ -0,0 +1,24 @@
+AUX 10firefox-bin 32 RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 SHA1 ec1c6c8583e7252222815c0d6c161310d25b2f3e SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08
+MD5 ae63664920447e96e1444e01ed8c9c11 files/10firefox-bin 32
+RMD160 0820c9d33296942b9d49f381ffd19e5bea4e5564 files/10firefox-bin 32
+SHA256 3163273068698dfc7da0a2edf8e558bb31d30eece410960672674a0eb019dc08 files/10firefox-bin 32
+AUX 71firefox-bin 22 RMD160 ad8d15a66d2f0d4b161808ca864f4d7c50faabd5 SHA1 9377344783592ae53aaeb9f0ae9992dae717b01b SHA256 2df8e74b89bfdad94bf1e534149b308b6905d1c3bfb6c927278d2ef5cb0f2fa4
+MD5 712d276ccee57b18a6db7cb5d4fc17d2 files/71firefox-bin 22
+RMD160 ad8d15a66d2f0d4b161808ca864f4d7c50faabd5 files/71firefox-bin 22
+SHA256 2df8e74b89bfdad94bf1e534149b308b6905d1c3bfb6c927278d2ef5cb0f2fa4 files/71firefox-bin 22
+AUX icon/mozilla-firefox-bin-icon.png 3979 RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 SHA1 4f009c0be2fb48bb2d95422bbde96d8e10e6dd9d SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e
+MD5 bff260036c5dcca45da3218517fb33d8 files/icon/mozilla-firefox-bin-icon.png 3979
+RMD160 7d8f39974e9853dcdd4af05142c9b57ae187ab45 files/icon/mozilla-firefox-bin-icon.png 3979
+SHA256 064ddf97649424540df1d4a4727ee4c08d6b2b7389621855601aec58241ac67e files/icon/mozilla-firefox-bin-icon.png 3979
+AUX icon/mozilla-firefox-bin.desktop 206 RMD160 251d25d13bb03818996884bf9b95405ba28a5bb3 SHA1 fa28692d7c34884298c7130b926e22290d7e96e4 SHA256 937ebcfb53c46d0800828d792ae10d8350c4be6692f22b214e340d5bb295f743
+MD5 f43e5a2277744d863ed1cb3d1bc9ed7f files/icon/mozilla-firefox-bin.desktop 206
+RMD160 251d25d13bb03818996884bf9b95405ba28a5bb3 files/icon/mozilla-firefox-bin.desktop 206
+SHA256 937ebcfb53c46d0800828d792ae10d8350c4be6692f22b214e340d5bb295f743 files/icon/mozilla-firefox-bin.desktop 206
+DIST firefox-3.0b3.tar.bz2 8997010 RMD160 edf5dea48420c744cb867cf494c4b3f9994589f8 SHA1 fdabc2c88cecc0207d225c5fbbbb04c3446aa2c9 SHA256 b413a33d752e9181f1957d5178e4f6e6e41dd3ed37e25d6d766bcc1b206099bc
+EBUILD mozilla-firefox-bin-3.0_beta3.ebuild 4368 RMD160 bdf4f9ca7b5d983ca6659addb46e39ecac2bbaeb SHA1 1d259f95fc813cabcc7a0591a612071a34e86329 SHA256 d0b9834cf3a44cf9e421c9a4e34689c0eff20a2fa2afca7b50c6c753bed67413
+MD5 21290b9f26115e8d5de7fc7f9d46e533 mozilla-firefox-bin-3.0_beta3.ebuild 4368
+RMD160 bdf4f9ca7b5d983ca6659addb46e39ecac2bbaeb mozilla-firefox-bin-3.0_beta3.ebuild 4368
+SHA256 d0b9834cf3a44cf9e421c9a4e34689c0eff20a2fa2afca7b50c6c753bed67413 mozilla-firefox-bin-3.0_beta3.ebuild 4368
+MD5 447a1c2474bc0d542033d5d31b464ab4 files/digest-mozilla-firefox-bin-3.0_beta3 247
+RMD160 d4d87fde25ce8092612c62c41bc58dedf426079b files/digest-mozilla-firefox-bin-3.0_beta3 247
+SHA256 f5f703d810513ad08ad575b661b4a82b8e748a1822dd1876def87a76cf4e149b files/digest-mozilla-firefox-bin-3.0_beta3 247
diff --git a/www-client/mozilla-firefox-bin/files/10firefox-bin b/www-client/mozilla-firefox-bin/files/10firefox-bin
new file mode 100644
index 0000000..6e0709e
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/10firefox-bin
@@ -0,0 +1 @@
+SEARCH_DIRS_MASK="/opt/firefox"
diff --git a/www-client/mozilla-firefox-bin/files/71firefox-bin b/www-client/mozilla-firefox-bin/files/71firefox-bin
new file mode 100644
index 0000000..4697b47
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/71firefox-bin
@@ -0,0 +1 @@
+LDPATH="/opt/firefox"
diff --git a/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-3.0_beta3 b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-3.0_beta3
new file mode 100644
index 0000000..8218203
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/digest-mozilla-firefox-bin-3.0_beta3
@@ -0,0 +1,3 @@
+MD5 fd609ee5ac617a993cbc8e39b520549a firefox-3.0b3.tar.bz2 8997010
+RMD160 edf5dea48420c744cb867cf494c4b3f9994589f8 firefox-3.0b3.tar.bz2 8997010
+SHA256 b413a33d752e9181f1957d5178e4f6e6e41dd3ed37e25d6d766bcc1b206099bc firefox-3.0b3.tar.bz2 8997010
diff --git a/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png
new file mode 100644
index 0000000..b7ff719
Binary files /dev/null and b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin-icon.png differ
diff --git a/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop
new file mode 100644
index 0000000..2e444b0
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/files/icon/mozilla-firefox-bin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Firefox (bin)
+Comment=Mozilla Firefox Web Browser
+Exec=/usr/bin/firefox-bin %U
+Icon=mozilla-firefox-bin-icon.png
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta3.ebuild b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta3.ebuild
new file mode 100644
index 0000000..b9e1789
--- /dev/null
+++ b/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta3.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox-bin/mozilla-firefox-bin-3.0_beta2.ebuild,v 1.1 2007/12/19 15:40:56 armin76 Exp $
+
+inherit eutils mozilla-launcher multilib mozextension
+
+#LANGS="be ca cs de el es-AR es-ES eu fi fr fy-NL gu-IN ja ko nb-NO nl pa-IN  pl pt-PT ro ru sk sv-SE tr uk zh-CN"
+#NOSHORTLANGS="es-AR"
+
+MY_PV=${PV/_beta/b}
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Firefox Web Browser"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/linux-i686/en-US/firefox-${MY_PV}.tar.bz2"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip"
+QA_EXECSTACK="opt/firefox/extensions/talkback@mozilla.org/components/libqfaservices.so"
+QA_TEXTRELS="opt/firefox/extensions/talkback@mozilla.org/components/libqfaservices.so"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="restrict-javascript"
+
+for X in ${LANGS} ; do
+	SRC_URI="${SRC_URI}
+		linguas_${X/-/_}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
+	IUSE="${IUSE} linguas_${X/-/_}"
+	# english is handled internally
+	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
+		SRC_URI="${SRC_URI}
+			linguas_${X%%-*}? ( http://dev.gentooexperimental.org/~armin76/dist/${MY_P/-bin}-xpi/${MY_P/-bin/}-${X}.xpi )"
+		IUSE="${IUSE} linguas_${X%%-*}"
+	fi
+done
+
+DEPEND="app-arch/unzip"
+RDEPEND="x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	x86? (
+		>=x11-libs/gtk+-2.2
+		=virtual/libstdc++-3.3
+	)
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-1.0
+		>=app-emulation/emul-linux-x86-gtklibs-1.0
+		app-emulation/emul-linux-x86-compat
+	)
+	>=www-client/mozilla-launcher-1.41"
+
+PDEPEND="restrict-javascript? ( x11-plugins/noscript )"
+
+S="${WORKDIR}/firefox"
+
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
+
+linguas() {
+	local LANG SLANG
+	for LANG in ${LINGUAS}; do
+		if has ${LANG} en en_US; then
+			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
+			continue
+		elif has ${LANG} ${LANGS//-/_}; then
+			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
+			continue
+		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
+			for X in ${LANGS}; do
+				if [[ "${X}" == "${LANG}-"* ]] && \
+					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
+					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
+					continue 2
+				fi
+			done
+		fi
+		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
+	done
+}
+
+src_unpack() {
+	unpack firefox-${MY_PV}.tar.bz2
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_unpack "${MY_P/-bin/}-${X}.xpi"
+	done
+	if [[ ${linguas} != "" ]]; then
+		einfo "Selected language packs (first will be default): ${linguas}"
+	fi
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	touch "${S}"/extensions/talkback@mozilla.org/chrome.manifest
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	linguas
+	for X in ${linguas}; do
+		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P/-bin/}-${X}"
+	done
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
+			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	install_mozilla_launcher_stub firefox-bin ${MOZILLA_FIVE_HOME}
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/icon/${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10firefox-bin
+
+	# install ldpath env.d
+	doenvd "${FILESDIR}"/71firefox-bin
+}
+
+pkg_preinst() {
+	declare MOZILLA_FIVE_HOME=/opt/firefox
+
+	# Remove entire installed instance to prevent all kinds of
+	# problems... see bug 44772 for example
+	rm -rf "${ROOT}"${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+	use amd64 && einfo "NB: You just installed a 32-bit firefox"
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}