diff --git a/data/terminator.desktop b/data/terminator.desktop
deleted file mode 100644
index 1f47da6b..00000000
--- a/data/terminator.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=Terminator
-Comment=Multiple terminals in one window
-Comment[be]=Meerdere terminals in een venster
-Comment[be@latin]=Meerdere terminals in een venster
-Comment[en_CA]=Multiple terminals in one window
-Comment[en_GB]=Multiple terminals in one window
-Comment[es]=Multiples terminales en una ventana
-Comment[fr]=Plusieurs terminaux dans une fenêtre
-TryExec=terminator
-Exec=terminator
-Icon=terminator
-Type=Application
-Categories=GNOME;GTK;Utility;TerminalEmulator;
-StartupNotify=true
-X-Ubuntu-Gettext-Domain=terminator
diff --git a/data/terminator.desktop.in b/data/terminator.desktop.in
new file mode 100644
index 00000000..499fea45
--- /dev/null
+++ b/data/terminator.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Terminator
+_Comment=Multiple terminals in one window
+TryExec=terminator
+Exec=terminator
+Icon=terminator
+Type=Application
+Categories=GNOME;GTK;Utility;TerminalEmulator;
+StartupNotify=true
+X-Ubuntu-Gettext-Domain=terminator
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 00000000..bbfa033f
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,13 @@
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
+#
+[encoding: UTF-8]
+build/lib/terminatorlib/config.py
+build/lib/terminatorlib/encoding.py
+build/lib/terminatorlib/terminator.py
+build/lib/terminatorlib/terminatorterm.py
+data/terminator.desktop.in
+terminatorlib/config.py
+terminatorlib/encoding.py
+terminatorlib/terminator.py
+terminatorlib/terminatorterm.py
diff --git a/setup.py b/setup.py
index 73216be1..336b3e49 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,13 @@ class BuildData(build):
           error("Error: %s" % str(e))
           sys.exit(1)
 
+    TOP_BUILDDIR='.'
+    INTLTOOL_MERGE='intltool-merge'
+    desktop_in='data/terminator.desktop.in'
+    desktop_data='data/terminator.desktop'
+    os.system ("C_ALL=C " + INTLTOOL_MERGE + " -d -u -c " + TOP_BUILDDIR +
+               "/po/.intltool-merge-cache " + TOP_BUILDDIR + "/po " +
+               desktop_in + " " + desktop_data)
 
 class Uninstall(Command):
   description = "Attempt an uninstall from an install --record file"