diff -u bittornado-0.3.18/debian/bittornado.desktop bittornado-0.3.18/debian/bittornado.desktop
--- bittornado-0.3.18/debian/bittornado.desktop
+++ bittornado-0.3.18/debian/bittornado.desktop
@@ -3,11 +3,11 @@
 Encoding=UTF-8
 Name=Bittornado Client
 GenericName=Bittorrent Client
-MultipleArgs=false
+X-MultipleArgs=false
 Exec=/usr/bin/btdownloadgui
-test=test -n "$DISPLAY"
+X-test=test -n "$DISPLAY"
 Type=Application
-Icon=/usr/share/pixmaps/bittornado.xpm
+Icon=bittornado
 MimeType=application/x-bittorrent;
 NoDisplay=false
 Categories=GNOME;Application;Network;FileTransfer;P2P;
diff -u bittornado-0.3.18/debian/control bittornado-0.3.18/debian/control
--- bittornado-0.3.18/debian/control
+++ bittornado-0.3.18/debian/control
@@ -1,7 +1,8 @@
 Source: bittornado
 Section: net
 Priority: optional
-Maintainer: Micah Anderson <micah@debian.org>
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Micah Anderson <micah@debian.org>
 Uploaders: Cameron Dale <camrdale@gmail.com>
 Build-Depends: dpatch, debhelper (>= 5.0.37.2)
 Build-Depends-Indep: python-dev, python-support (>= 0.5.4), docbook-to-man
diff -u bittornado-0.3.18/debian/changelog bittornado-0.3.18/debian/changelog
--- bittornado-0.3.18/debian/changelog
+++ bittornado-0.3.18/debian/changelog
@@ -1,3 +1,11 @@
+bittornado (0.3.18-3ubuntu1) gutsy; urgency=low
+
+  * Fixed absolute path and other spec problems directly in 
+    bittornado's .desktop file in debian/. (Thanks to Thierry Moisan for the fix) (LP: #4587)
+  * Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Fri, 15 Jun 2007 23:47:05 +0200
+
 bittornado (0.3.18-3) unstable; urgency=low
 
   * Added a recommends on python-crypto for encrypted communications