diff --git a/x11-plugins/add-n-edit-cookies/Manifest b/x11-plugins/add-n-edit-cookies/Manifest
index 8032152fe..37fca83eb 100644
--- a/x11-plugins/add-n-edit-cookies/Manifest
+++ b/x11-plugins/add-n-edit-cookies/Manifest
@@ -1,3 +1,4 @@
 AUX ff-3.5_fix.patch 434 RMD160 154ec87c782315dceec2422aa47e92b294afab8e SHA1 6db5e063bac32ad6b7acd26fba51c63a4f99ce20 SHA256 bb8eac21b632125248b4c989e476b546cb07021d78c183888647f52244ee3a99
 DIST add_n_edit_cookies-0.2.1.3-fx+mz.xpi 57206 RMD160 c761d6c36e79a06ffde93f3b63a24398429e3e25 SHA1 90a6f5d3bd61fdc6fa77e72704f1bcdcd6eddf26 SHA256 a0863ebbe7f69f783e24c0b46c251e4e241b08e82b79854c0ec10171042f67da
 EBUILD add-n-edit-cookies-0.2.1.3-r1.ebuild 1058 RMD160 5e516de6d8f7d4e9a776675c99206c15e4994566 SHA1 7ff2489702720199079ea21e1352b937c6fe6740 SHA256 b925a26d41e1346b31c8e1ecb220d0f347c1b2e844ccf08f7186490bf9709796
+EBUILD add-n-edit-cookies-0.2.1.3-r2.ebuild 1042 RMD160 3c1766292f36ccc1351994df1d970562d9513094 SHA1 fcee1e78e1edd1afafe4770f8222ae013384c785 SHA256 d2d13fbb8f8df1a3c68679a887d959f0a4987360b486cf9cbf6eac81b7d4374a
diff --git a/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-r2.ebuild b/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-r2.ebuild
new file mode 100644
index 000000000..a8890a867
--- /dev/null
+++ b/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-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="${PN//-/_}-${PV}-fx+mz"
+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/573/${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}/ff-3.5_fix.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
+}