diff --git a/makepot b/makepot
index 69f9a22..b52c1c4 100755
--- a/makepot
+++ b/makepot
@@ -1,4 +1,8 @@
 #!/bin/bash
 
+rm -f xapp.pot
+touch xapp.pot
 xgettext --language=C --keyword=_ --keyword=N_ --output=xapp.pot libxapp/*.c
+xgettext --language=Desktop --join-existing --add-comments \
+          -k --keyword=Name --keyword=Description --output=xapp.pot status-applets/*/*.in
 
diff --git a/status-applets/mate/meson.build b/status-applets/mate/meson.build
index a92557e..baf1dfd 100644
--- a/status-applets/mate/meson.build
+++ b/status-applets/mate/meson.build
@@ -19,7 +19,7 @@
 conf.set('libexec', join_paths(get_option('prefix'), get_option('libexecdir')))
 
 service_file = configure_file(
-  input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service.in',
+  input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
   output: 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
   configuration: conf,
 )
@@ -30,13 +30,11 @@
 
 ## Applet definition file
 
-def_file = configure_file(
-  input : 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
+i18n.merge_file(
+  input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
   output: 'org.x.MateXAppStatusApplet.mate-panel-applet',
-  configuration: conf,
-)
-
-install_data(def_file,
+  type: 'desktop',
+  po_dir: join_paths(meson.source_root(), 'po'),
+  install: true,
   install_dir: join_paths(get_option('datadir'), 'mate-panel', 'applets')
 )
-
diff --git a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service
new file mode 100644
index 0000000..78a4827
--- /dev/null
+++ b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.mate.panel.applet.MateXAppStatusAppletFactory
+Exec=@libexec@/xapps/mate-xapp-status-applet.py
diff --git a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in
deleted file mode 100644
index 78a4827..0000000
--- a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.mate.panel.applet.MateXAppStatusAppletFactory
-Exec=@libexec@/xapps/mate-xapp-status-applet.py