diff --git a/x11-plugins/httpfox/Manifest b/x11-plugins/httpfox/Manifest
index 1129c582b..a6993c03d 100644
--- a/x11-plugins/httpfox/Manifest
+++ b/x11-plugins/httpfox/Manifest
@@ -1,3 +1,4 @@
 AUX httpfox-0.8.4-fx.patch 459 RMD160 197af3621fa267a1e98878a26f925a025d0dd002 SHA1 6de0dab21e2b793a997fe0283e7018839319dff1 SHA256 c16120f53a4729c2eb3b4601e6dff018f96fb235fa4671cb00494e98e570f326
 DIST httpfox-0.8.4-fx.xpi 107306 RMD160 bdd46cb16d2a85c9197b11cab67c8eace73eab85 SHA1 fc76aee3e548fe505e6a76e96e01eb719e36a42d SHA256 41fb5e768b50703fa06c43bc6cf65d3e3e825a7fc294e6fb0edb142f8f0f75b0
 EBUILD httpfox-0.8.4-r1.ebuild 1041 RMD160 3f95dd6941fac7b8e94a7f0132456a15671ac771 SHA1 f5dabdd1e147cdcd949967b0dfc329cbde984033 SHA256 16ba5679fbda9ab5ffe58a1801fed2719e6097b99e66589361a3acedbc8f2983
+EBUILD httpfox-0.8.4-r2.ebuild 1025 RMD160 2523929588047bc5254a65f04b32b3dcb514d425 SHA1 1a0905e5956a93c57188e641d3a78ee9287f5424 SHA256 0778cfc70d31976e0146dc7ed692d1e722ba3fad3153c9f049a1239608ba1cb2
diff --git a/x11-plugins/httpfox/httpfox-0.8.4-r2.ebuild b/x11-plugins/httpfox/httpfox-0.8.4-r2.ebuild
new file mode 100644
index 000000000..c0862d7ee
--- /dev/null
+++ b/x11-plugins/httpfox/httpfox-0.8.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit mozextension-2 multilib eutils
+
+MY_P="${P}-fx"
+DESCRIPTION="A Firefox extensions from the firecat framework."
+HOMEPAGE="http://www.security-database.com/toolswatch/FireCAT-Firefox-Catalog-of,302.html"
+SRC_URI="http://releases.mozilla.org/pub/mozilla.org/addons/6647/${MY_P}.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| (
+	>=www-client/firefox-bin-3.0.0
+	>=www-client/firefox-3.0.0
+)"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	xpi_unpack $A
+	epatch "${FILESDIR}/${MY_P}.patch"
+}
+
+src_compile () {
+	einfo "Nothing to compile"
+}
+
+src_install () {
+	declare MOZILLA_FIVE_HOME
+	if has_version '>=www-client/mozilla-firefox-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-firefox"
+		xpi_install "${S}/${MY_P}"
+	fi
+	if has_version '>=www-client/mozilla-firefox-bin-1.5.0.7'; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "${S}/${MY_P}"
+	fi
+}