diff --git a/data/gajim-remote.desktop.in b/data/gajim-remote.desktop.in
index 3efd0b5f4..0949e682b 100644
--- a/data/gajim-remote.desktop.in
+++ b/data/gajim-remote.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
-_Name=Open URI using Gajim
-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
+Name=Open URI using Gajim
+Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip;
 Version=1.0
 Exec=gajim-remote handle_uri %u
 TryExec=gajim-remote
diff --git a/data/org.gajim.Gajim.desktop.in b/data/org.gajim.Gajim.desktop.in
index b8a5c0e08..5562ab970 100644
--- a/data/org.gajim.Gajim.desktop.in
+++ b/data/org.gajim.Gajim.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Categories=Network;InstantMessaging;GTK;GNOME;
-_Name=Gajim
-_GenericName=Jabber IM Client
-_Comment=A GTK+ Jabber client
-_Keywords=chat;messaging;im;xmpp;bonjour;voip;
+Name=Gajim
+GenericName=Jabber IM Client
+Comment=A GTK+ Jabber client
+Keywords=chat;messaging;im;xmpp;bonjour;voip;
 Version=1.0
 Exec=gajim
 Icon=org.gajim.Gajim
diff --git a/setup.py b/setup.py
index f21dc988b..2956a2653 100644
--- a/setup.py
+++ b/setup.py
@@ -83,9 +83,9 @@ def build_intl(build_cmd):
     data_files = build_cmd.distribution.data_files
     base = cwd
 
-    merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '-d'),
-                   ('data/gajim-remote.desktop', 'share/applications', '-d'),
-                   ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '-x'))
+    merge_files = (('data/org.gajim.Gajim.desktop', 'share/applications', '--desktop'),
+                   ('data/gajim-remote.desktop', 'share/applications', '--desktop'),
+                   ('data/org.gajim.Gajim.appdata.xml', 'share/metainfo', '--xml'))
 
     for filename, target, option in merge_files:
         filenamelocal = convert_path(filename)
@@ -110,30 +110,17 @@ def substitute_variables(filename_in, filename_out, subst_vars):
     f_out.close()
 
 
-def merge(in_file, out_file, option, po_dir='po', cache=True):
+def merge(in_file, out_file, option, po_dir='po'):
     '''
-    Run the intltool-merge command.
+    Run the msgfmt command.
     '''
-    option += ' -u'
-    if cache:
-        cache_file = os.path.join('po', '.intltool-merge-cache')
-        option += ' -c ' + cache_file
-
     if (not os.path.exists(out_file) and os.path.exists(in_file)):
-        if sys.platform == 'win32':
-            cmd = (('set LC_ALL=C && perl -S intltool-merge %(opt)s %(po_dir)s %(in_file)s '
-                '%(out_file)s') %
-              {'opt' : option,
-               'po_dir' : po_dir,
-               'in_file' : in_file,
-               'out_file' : out_file})
-        else:
-            cmd = (('LC_ALL=C intltool-merge %(opt)s %(po_dir)s %(in_file)s '
-                '%(out_file)s') %
-              {'opt' : option,
-               'po_dir' : po_dir,
-               'in_file' : in_file,
-               'out_file' : out_file})
+        cmd = (('msgfmt %(opt)s -d %(po_dir)s --template %(in_file)s '
+            '-o %(out_file)s') %
+          {'opt' : option,
+           'po_dir' : po_dir,
+           'in_file' : in_file,
+           'out_file' : out_file})
         if os.system(cmd) != 0:
             msg = ('ERROR: %s was not merged into the translation files!\n' %
                     out_file)