diff --git a/x11-plugins/add-n-edit-cookies/Manifest b/x11-plugins/add-n-edit-cookies/Manifest
index 61cfe1075..80a003ada 100644
--- a/x11-plugins/add-n-edit-cookies/Manifest
+++ b/x11-plugins/add-n-edit-cookies/Manifest
@@ -1,2 +1,3 @@
+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.ebuild 1054 RMD160 07d668031a5ed439eb8e9c5d1393eb71a63d42eb SHA1 2b10e1bc97ddfe6e257c1149b5e21d6e4c48df62 SHA256 2773b5d6b5f1b073b24db22d411bd32b6599f244c36d0c21ffc4329879a8a1bc
+EBUILD add-n-edit-cookies-0.2.1.3-r1.ebuild 1054 RMD160 91ac2a3565283675241cdbafdb674451d24365f8 SHA1 31236e972a131bd17ef04d1fa4e4b1d38571a450 SHA256 176ab238c1d05847bea0b568cc81c325d57babb16add316292f1f21f08ba428c
diff --git a/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3.ebuild b/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-r1.ebuild
similarity index 92%
rename from x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3.ebuild
rename to x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-r1.ebuild
index 3699503dd..481b6608b 100644
--- a/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3.ebuild
+++ b/x11-plugins/add-n-edit-cookies/add-n-edit-cookies-0.2.1.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit mozextension multilib eutils
+inherit mozextension-2 multilib eutils
 
 MY_P="${PN//-/_}-${PV}-fx+mz"
 DESCRIPTION="A Firefox extensions from the firecat framework."
@@ -24,7 +24,7 @@ S="${WORKDIR}"
 
 src_unpack() {
 	xpi_unpack $A
-#	epatch "${FILESDIR}/${MY_P}.patch"
+	epatch "${FILESDIR}/ff-3.5.patch"
 }
 
 src_compile () {
diff --git a/x11-plugins/add-n-edit-cookies/files/ff-3.5_fix.patch b/x11-plugins/add-n-edit-cookies/files/ff-3.5_fix.patch
new file mode 100644
index 000000000..1200ff506
--- /dev/null
+++ b/x11-plugins/add-n-edit-cookies/files/ff-3.5_fix.patch
@@ -0,0 +1,11 @@
+--- install.rdf.orig	2008-07-10 06:48:55.000000000 +0000
++++ install.rdf	2009-11-25 14:34:39.000000000 +0000
+@@ -13,7 +13,7 @@
+       <Description>
+         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+         <em:minVersion>1.0</em:minVersion>
+-        <em:maxVersion>3.0.*</em:maxVersion>
++        <em:maxVersion>3.5.*</em:maxVersion>
+       </Description>
+     </em:targetApplication>
+     <em:targetApplication>