diff --git a/.gitignore b/.gitignore
index 84df355e2b601adf37a6e6a520f50d42c16187aa..5c61460b9e271448ef7a90c04dab43e4da70c5aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,3 +208,15 @@ sflphone-client-gnome/stamp-h1
 /tools/build-system/launchpad/*.build
 /tools/build-system/launchpad/*.upload
 
+# telify
+/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone
+/tools/mozilla-telify-sflphone/tmp/
+/tools/mozilla-telify-sflphone/*-stamp
+/tools/*.dsc
+/tools/*.tar.gz
+/tools/*.deb
+/tools/*.build
+/tools/*.changes
+/tools/mozilla-telify-sflphone/debian/control
+/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
+
diff --git a/tools/mozilla-telify-sflphone/debian/changelog b/tools/mozilla-telify-sflphone/debian/changelog
index 8ea3e02afc3275ce05b00e12893edee6e42557f7..e368436b93aa5b42f1181e9c9e4022ec9e0f929f 100644
--- a/tools/mozilla-telify-sflphone/debian/changelog
+++ b/tools/mozilla-telify-sflphone/debian/changelog
@@ -4,4 +4,3 @@ mozilla-telify-sflphone (0.4.7.3) unstable; urgency=low
   * Package creation
 
  -- Julien Bonjean <julien.bonjean@savoirfairelinux.com>  Fri, 20 Nov 2009 19:51:54 +0100
-
diff --git a/tools/mozilla-telify-sflphone/debian/control.debian b/tools/mozilla-telify-sflphone/debian/control.debian
index d4a3deefdd306dc4b03ef5d04a3f6f58b2d2862e..36a90b1f2ddcd78cadc00ede03d8649537f8c54f 100644
--- a/tools/mozilla-telify-sflphone/debian/control.debian
+++ b/tools/mozilla-telify-sflphone/debian/control.debian
@@ -4,13 +4,16 @@ Priority: optional
 Maintainer: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
 Uploaders: Julien Bonjean <julien.bonjean@savoirfairelinux.com>
 Build-Depends: debhelper (>= 7), unzip
-Depends: iceweasel-gnome-support
 Homepage: http://www.sflphone.org
 Standards-Version: 3.8.3
 DM-Upload-Allowed: yes
 
 Package: mozilla-telify-sflphone
+Depends: iceweasel-gnome-support, sflphone-client-gnome
 Architecture: all
-Depends: iceweasel (>= 3.0)
-Description: TBD
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
 
diff --git a/tools/mozilla-telify-sflphone/debian/control b/tools/mozilla-telify-sflphone/debian/control.ubuntu
similarity index 52%
rename from tools/mozilla-telify-sflphone/debian/control
rename to tools/mozilla-telify-sflphone/debian/control.ubuntu
index 88fcc2ff5f9541792e8291332fe809d5d0fb13be..01e98ce8031fcb3b5edf0ddbb7027936f529ce6c 100644
--- a/tools/mozilla-telify-sflphone/debian/control
+++ b/tools/mozilla-telify-sflphone/debian/control.ubuntu
@@ -11,5 +11,9 @@ DM-Upload-Allowed: yes
 Package: mozilla-telify-sflphone
 Depends: firefox-gnome-support, sflphone-client-gnome
 Architecture: all
-Description: TBD
+Description: This package provides telify firefox plugin and handler for SFLphone.
+ Telify recognizes phone numbers on web pages and converts them to clickable links.
+ Additionally, any text can be selected and handled as a phone number (including
+ vanity number conversion) by selecting the corresponding context menu item.
+ http://www.codepad.de/en/software/firefox-add-ons/telify.html
 
diff --git a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install
index ffb9a7d05272745311627020430a2de487701166..937e53876e144e58b5c23f555deec380159f457b 100644
--- a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install
+++ b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.install
@@ -1,5 +1,2 @@
-temp/install.rdf usr/share/mozilla-extensions/telify/
-temp/chrome.manifest usr/share/mozilla-extensions/telify/
-temp/defaults/* usr/share/mozilla-extensions/telify/defaults
-temp/chrome/* usr/share/mozilla-extensions/telify/chrome
+tmp/telify usr/share/
 sflphone-handler usr/bin/
diff --git a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
deleted file mode 100644
index 5fa1937c3e0b8da00311a36a3de54ad61376beea..0000000000000000000000000000000000000000
--- a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/mozilla-extensions/telify usr/lib/iceweasel/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian
new file mode 100644
index 0000000000000000000000000000000000000000..f8f52cec904e91fe248e874af8edaf64b6ff04cb
--- /dev/null
+++ b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.debian
@@ -0,0 +1 @@
+usr/share/telify usr/lib/iceweasel/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu
new file mode 100644
index 0000000000000000000000000000000000000000..f234168dd005f777b71662153559dbe689f1aebf
--- /dev/null
+++ b/tools/mozilla-telify-sflphone/debian/mozilla-telify-sflphone.links.ubuntu
@@ -0,0 +1 @@
+usr/share/telify usr/lib/firefox-addons/extensions/{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}
diff --git a/tools/mozilla-telify-sflphone/debian/postinst b/tools/mozilla-telify-sflphone/debian/postinst
index 293cbf05a1eda7ca3a0ff2752decc4114cbd3ce4..1039df3268eae8fca20a728add6c4939f7494360 100755
--- a/tools/mozilla-telify-sflphone/debian/postinst
+++ b/tools/mozilla-telify-sflphone/debian/postinst
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-set -x
-
 gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t string -s /desktop/gnome/url-handlers/tel/command "/usr/bin/sflphone-handler %s"
 gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -s /desktop/gnome/url-handlers/tel/needs_terminal false -t bool
 gconftool-2 --direct --config-source xml::/etc/gconf/gconf.xml.defaults -t bool -s /desktop/gnome/url-handlers/tel/enabled true
diff --git a/tools/mozilla-telify-sflphone/debian/rules b/tools/mozilla-telify-sflphone/debian/rules
index b6418e1b0496f5404895f0bad455bb62a3f6e7c8..0e8b875eb41ef0f3b085984d5b6f7cdde67c6181 100755
--- a/tools/mozilla-telify-sflphone/debian/rules
+++ b/tools/mozilla-telify-sflphone/debian/rules
@@ -1,42 +1,40 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
-ID="{6c5f349a-ddda-49ad-bdf0-326d3fe1f938}"
+VERSION="0.4.7.3"
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-
 	touch configure-stamp
 
 build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	mkdir -p temp
-	unzip -o -d temp *.xpi
+	echo ${DIR}
+	umask 0022
+	mkdir -p tmp/telify
+	unzip telify-${VERSION}-fx.xpi -d tmp/telify
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
-
-	-rm -rf temp
-
 	dh_clean
 
+	rm -rf tmp
+
 install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
 	dh_install
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
diff --git a/tools/mozilla-telify-sflphone/debian/watch b/tools/mozilla-telify-sflphone/debian/watch
new file mode 100644
index 0000000000000000000000000000000000000000..74d5ff27773e694ea8f295be016733cf2ab260ed
--- /dev/null
+++ b/tools/mozilla-telify-sflphone/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.codepad.de/en/telify.html /download/telify-(.*)-fx.xpi