diff --git a/meson.build b/meson.build
index 5daa5304b..d743ca914 100644
--- a/meson.build
+++ b/meson.build
@@ -357,6 +357,7 @@ installed_tests_execdir = join_paths(pipewire_libexecdir, 'installed-tests', pip
 installed_tests_enabled = get_option('installed_tests')
 installed_tests_template = files('template.test.in')
 
+subdir('po')
 subdir('spa')
 subdir('src')
 
diff --git a/po/LINGUAS b/po/LINGUAS
index e69de29bb..f13d7ddbe 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -0,0 +1 @@
+gl
diff --git a/po/gl.po b/po/gl.po
index 5fe697a7d..b2d7c658b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,8 +5,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pipewire VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 14:22+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/pipewire/pipewire/"
+"issues/new\n"
+"POT-Creation-Date: 2021-01-08 10:06+0100\n"
 "PO-Revision-Date: 2021-01-07 14:23+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <proxecto@trasno.gal>\n"
@@ -17,10 +18,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Gtranslator 3.38.0\n"
 
-#: ../src/daemon/pipewire.desktop.in.h:1
+#: src/daemon/pipewire.desktop.in:4
 msgid "PipeWire Media System"
 msgstr "Sistema multimedia PipeWire"
 
-#: ../src/daemon/pipewire.desktop.in.h:2
+#: src/daemon/pipewire.desktop.in:5
 msgid "Start the PipeWire Media System"
 msgstr "Iniciar o Sistema multimedia PipeWire"
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index b7b6cf6e7..c0a6fefb2 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -53,6 +53,22 @@ executable('pipewire-pulse',
   dependencies : [pipewire_dep, ],
 )
 
+desktop_file = i18n.merge_file(
+  input : 'pipewire.desktop.in',
+  output : 'pipewire.desktop',
+  po_dir : po_dir,
+  type : 'desktop',
+#  install : true,
+#  install_dir : join_paths(pipewire_sysconfdir, 'xdg', 'autostart')
+)
+
+desktop_utils = find_program('desktop-file-validate', required: false)
+if desktop_utils.found()
+  test('Validate desktop file', desktop_utils,
+    args: [ desktop_file ],
+  )
+endif
+
 if get_option('systemd') and systemd.found()
   subdir('systemd')
 endif
diff --git a/src/daemon/pipewire.desktop.in b/src/daemon/pipewire.desktop.in
index 7ff72c557..ebf0e305a 100644
--- a/src/daemon/pipewire.desktop.in
+++ b/src/daemon/pipewire.desktop.in
@@ -1,11 +1,9 @@
 [Desktop Entry]
 Version=1.0
-_Name=PipeWire Media System
-_Comment=Start the PipeWire Media System
+Name=PipeWire Media System
+Comment=Start the PipeWire Media System
 Exec=pipewire
 Terminal=false
 Type=Application
-Categories=
-GenericName=
 X-GNOME-Autostart-Phase=Initialization
 X-KDE-autostart-phase=1