diff -u httrack-3.41.22/debian/control httrack-3.41.22/debian/control
--- httrack-3.41.22/debian/control
+++ httrack-3.41.22/debian/control
@@ -1,7 +1,8 @@
 Source: httrack
 Section: web
 Priority: optional
-Maintainer: Xavier Roche <roche@httrack.com>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Xavier Roche <roche@httrack.com>
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>> 4.0.0), zlib1g-dev
 
@@ -28,8 +29,8 @@
 Package: webhttrack
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, iceape-browser | www-browser
 Suggests: httrack, httrack-doc
+Depends: ${shlibs:Depends}, firefox | www-browser
 Conflicts: httrack-doc (<= 3.40.4-2), webhttrack (<= 3.40.4-2)
 Replaces: httrack-doc (<= 3.40.4-2), webhttrack (<= 3.40.4-2)
 Description: Copy websites to your computer, httrack with a Web interface
diff -u httrack-3.41.22/debian/changelog httrack-3.41.22/debian/changelog
--- httrack-3.41.22/debian/changelog
+++ httrack-3.41.22/debian/changelog
@@ -1,9 +1,26 @@
+httrack (3.41.22-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Depend on firefox | www-browser.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Sat, 16 Jun 2007 23:33:20 +0200
+
 httrack (3.41.22-1) unstable; urgency=low
 
   * Updated to 3.41.22 (3.41-3) ; fixed configure.in
 
  -- Xavier Roche <xavier@debian.org>  Sat, 16 Jun 2007 17:27:26 +0200
 
+httrack (3.41.20-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Depend on firefox | www-browser. 
+
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  5 May 2007 20:04:11 +0200
+
 httrack (3.41.20-1) unstable; urgency=low
 
   * Updated to 3.41.20 (3.41) (closes:#366763, #406807)
@@ -118,6 +135,12 @@
 
  -- Xavier Roche <xavier@debian.org>  Sat,  5 Aug 2006 14:25:04 +0200
 
+httrack (3.40.4-3.1ubuntu1) feisty; urgency=low
+
+  * Depend on firefox | www-browser. 
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 14 Feb 2007 14:29:05 +0100
+
 httrack (3.40.4-3.1) unstable; urgency=medium
 
   * Non-Maintainer upload