diff -u elinks-0.11.3/debian/changelog elinks-0.11.3/debian/changelog
--- elinks-0.11.3/debian/changelog
+++ elinks-0.11.3/debian/changelog
@@ -1,3 +1,12 @@
+elinks (0.11.3-3ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable (LP: #187936); remaining changes:
+    - Add X-Ubuntu-Gettext-Domain to .desktop files.
+    - debian/control: Maintainer field update.
+  * Improve the text in the .desktop file and add some translations.
+
+ -- Siegfried-Angel Gevatter Pujals (RainCT) <rainct@ubuntu.com>  Fri, 01 Feb 2008 16:29:06 +0100
+
 elinks (0.11.3-3) unstable; urgency=low
 
   * Remove 06_elinks.conf-parse-error.diff and use a minimal elinks.conf file
@@ -83,6 +92,13 @@
       URIs for local CGI.
 
  -- Y Giridhar Appaji Nag <giridhar@appaji.net>  Mon, 07 Jan 2008 00:10:17 +0530
+elinks (0.11.1-1.5ubuntu1) gutsy; urgency=low
+
+  * Merge to Debian unstable: remaining Ubuntu changes:
+    - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files.
+    - debian/control: Maintainer field updates.
+
+ -- Michael Bienia <geser@ubuntu.com>  Tue, 25 Sep 2007 19:35:04 +0200
 
 elinks (0.11.1-1.5) unstable; urgency=high
 
@@ -92,6 +108,14 @@
 
  -- Nico Golde <nion@debian.org>  Tue, 25 Sep 2007 13:31:18 +0200
 
+elinks (0.11.1-1.4ubuntu1) gutsy; urgency=low
+
+  * Merge to Debian unstable: remaining Ubuntu changes:
+    - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files.
+    - debian/control: Maintainer field updates.
+
+ -- Kees Cook <kees@ubuntu.com>  Thu, 03 May 2007 10:55:52 -0700
+
 elinks (0.11.1-1.4) unstable; urgency=high
 
   * Non-maintainer security upload.
@@ -109,6 +133,21 @@
 
  -- Aurelien Jarno <aurel32@debian.org>  Sun,  4 Mar 2007 12:36:59 +0100
 
+elinks (0.11.1-1.2ubuntu2) feisty; urgency=low
+
+  * Rebuild for changes in the amd64 toolchain.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  5 Mar 2007 01:15:26 +0000
+
+elinks (0.11.1-1.2ubuntu1) feisty; urgency=low
+
+  * Merge to Debian unstable: remaining Ubuntu changes:
+    - debian/control, debian/rules: Killed type-handling.
+    - debian/rules: Add X-Ubuntu-Gettext-Domain to .desktop files.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 28 Nov 2006 18:52:30 +0100
+
 elinks (0.11.1-1.2) unstable; urgency=high
 
   * Non-maintainer upload.
@@ -549 +587,0 @@
-
diff -u elinks-0.11.3/debian/control elinks-0.11.3/debian/control
--- elinks-0.11.3/debian/control
+++ elinks-0.11.3/debian/control
@@ -1,7 +1,8 @@
 Source: elinks
 Section: web
 Priority: optional
-Maintainer: Y Giridhar Appaji Nag <giridhar@appaji.net>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Y Giridhar Appaji Nag <giridhar@appaji.net>
 Uploaders: Moritz Muehlenhoff <jmm@debian.org>
 Build-Depends: debhelper (>= 5), libgnutls-dev, libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], liblua50-dev, liblualib50-dev, libbz2-dev, libexpat1-dev (>= 1.95.6), libperl-dev, autotools-dev, gettext, asciidoc, xmlto, docbook-utils, perl
 Standards-Version: 3.7.3
diff -u elinks-0.11.3/debian/elinks.desktop elinks-0.11.3/debian/elinks.desktop
--- elinks-0.11.3/debian/elinks.desktop
+++ elinks-0.11.3/debian/elinks.desktop
@@ -2,10 +2,19 @@
+Type=Application
 Version=1.0
-Name=ELinks
-Categories=Utility;Network;
-GenericName=ELinks Web Browser
-Comment=ELinks text mode WWW browser
+Name=ELinks Web Browser
+Name[ca]=Navegador web ELinks
+Name[de]=ELinks Webbrowser
+Name[es]=Navegador web ELinks
+GenericName=Web Browser
+GenericName[ca]=Navegador web
+GenericName[de]=Webbrowser
+genericName[es]=Navegador web
+Comment=Browse the web in text mode
+Comment[ca]=Navegeu per el web en mode text
+Comment[es]=Navega por el web en modo texto
 Exec=/usr/bin/elinks %u
 Terminal=true
-Type=Application
 Icon=html
 MimeType=text/html;
+Categories=Utility;Network;
+X-Ubuntu-Gettext-Domain=elinks