diff -u torbutton-1.0.4/debian/iceweasel-torbutton.install torbutton-1.0.4/debian/iceweasel-torbutton.install
--- torbutton-1.0.4/debian/iceweasel-torbutton.install
+++ torbutton-1.0.4/debian/iceweasel-torbutton.install
@@ -1,4 +1,4 @@
-src/chrome		usr/share/iceweasel-extensions/torbutton
-src/chrome.manifest	usr/share/iceweasel-extensions/torbutton
-src/install.rdf		usr/share/iceweasel-extensions/torbutton
-src/defaults		usr/share/iceweasel-extensions/torbutton
+src/chrome		usr/share/firefox-extensions/torbutton
+src/chrome.manifest	usr/share/firefox-extensions/torbutton
+src/install.rdf		usr/share/firefox-extensions/torbutton
+src/defaults		usr/share/firefox-extensions/torbutton
diff -u torbutton-1.0.4/debian/control torbutton-1.0.4/debian/control
--- torbutton-1.0.4/debian/control
+++ torbutton-1.0.4/debian/control
@@ -1,13 +1,14 @@
 Source: torbutton
 Section: web
 Priority: optional
-Maintainer: Jérémy Bobbio <lunar@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jérémy Bobbio <lunar@debian.org>
 Build-Depends: debhelper (>= 5.0.0)
 Standards-Version: 3.7.2
 
 Package: iceweasel-torbutton
 Architecture: all
-Depends: iceweasel (>= 2.0.0.3-1)
+Depends: iceweasel (>= 2.0.0.3-1) | firefox (>= 2.0.0.3-1)
 Recommends: tor, privoxy
 Description: iceweasel extension enabling 1-click toggle of Tor usage
  Torbutton is a 1-click way for Iceweasel users to enable or disable the
diff -u torbutton-1.0.4/debian/changelog torbutton-1.0.4/debian/changelog
--- torbutton-1.0.4/debian/changelog
+++ torbutton-1.0.4/debian/changelog
@@ -1,3 +1,16 @@
+torbutton (1.0.4-2ubuntu1) gutsy; urgency=low
+
+  * Add of a possible dependency to firefox or iceweasel (LP: #137513)
+    - Modification of the Depend Field of the debian/control file
+    - Modification of debian/iceweasel-torbutton.dirs,
+      debian/iceweasel-torbutton.install and debian/iceweasel-torbutton.links
+      to take into account firefox extensions directory.
+    - Linkage of the iceweasel extension directory to the firefox one, instead
+      of duplicating the extension.
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Christophe Sauthier <christophe.sauthier@gmail.com>  Thu,  4 Oct 2007 13:43:25 +0200
+
 torbutton (1.0.4-2) unstable; urgency=low
 
   * Add a short description of Tor in package descriptions (as suggested by
diff -u torbutton-1.0.4/debian/iceweasel-torbutton.links torbutton-1.0.4/debian/iceweasel-torbutton.links
--- torbutton-1.0.4/debian/iceweasel-torbutton.links
+++ torbutton-1.0.4/debian/iceweasel-torbutton.links
@@ -1 +1,2 @@
-usr/share/iceweasel-extensions/torbutton usr/lib/iceweasel/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
+usr/share/firefox-extensions/torbutton usr/lib/iceweasel/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
+usr/share/firefox-extensions/torbutton usr/lib/firefox/extensions/{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}
diff -u torbutton-1.0.4/debian/iceweasel-torbutton.dirs torbutton-1.0.4/debian/iceweasel-torbutton.dirs
--- torbutton-1.0.4/debian/iceweasel-torbutton.dirs
+++ torbutton-1.0.4/debian/iceweasel-torbutton.dirs
@@ -1,2 +1,3 @@
-usr/share/iceweasel-extensions/torbutton
 usr/lib/iceweasel/extensions
+usr/lib/firefox/extensions
+usr/share/firefox-extensions/torbutton