diff --git a/status-applets/mate/meson.build b/status-applets/mate/meson.build
index 54d01f7..1613da9 100644
--- a/status-applets/mate/meson.build
+++ b/status-applets/mate/meson.build
@@ -30,7 +30,7 @@
 conf.set('libexec', join_paths(get_option('prefix'), get_option('libexecdir')))
 
 service_file = configure_file(
-  input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
+  input : 'org.mate.panel.applet.MateXAppStatusAppletFactory.service.in',
   output: 'org.mate.panel.applet.MateXAppStatusAppletFactory.service',
   configuration: conf,
 )
@@ -41,8 +41,14 @@
 
 ## Applet definition file
 
+def_file = configure_file(
+  input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in.in',
+  output: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
+  configuration: conf,
+)
+
 i18n.merge_file(
-  input: 'org.x.MateXAppStatusApplet.mate-panel-applet.in',
+  input: def_file,
   output: 'org.x.MateXAppStatusApplet.mate-panel-applet',
   type: 'desktop',
   po_dir: join_paths(meson.source_root(), 'po'),
diff --git a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service
deleted file mode 100644
index 78a4827..0000000
--- a/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[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
new file mode 100644
index 0000000..78a4827
--- /dev/null
+++ b/status-applets/mate/org.mate.panel.applet.MateXAppStatusAppletFactory.service.in
@@ -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.x.MateXAppStatusApplet.mate-panel-applet.in b/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in
deleted file mode 100644
index b1476cb..0000000
--- a/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Applet Factory]
-Id=MateXAppStatusAppletFactory
-InProcess=false
-Location=@libexec@/xapps/mate-xapp-status-applet.py
-Name=XApp Status Applet Factory
-Description=Area where XApp status icons appear
-
-[MateXAppStatusApplet]
-Name=XApp Status Applet
-Description=Area where XApp status icons appear
-Icon=panel-applets
-MateComponentId=OAFIID:MATE_MateXAppStatusApplet;
-
diff --git a/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in b/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in
new file mode 100644
index 0000000..b1476cb
--- /dev/null
+++ b/status-applets/mate/org.x.MateXAppStatusApplet.mate-panel-applet.in.in
@@ -0,0 +1,13 @@
+[Applet Factory]
+Id=MateXAppStatusAppletFactory
+InProcess=false
+Location=@libexec@/xapps/mate-xapp-status-applet.py
+Name=XApp Status Applet Factory
+Description=Area where XApp status icons appear
+
+[MateXAppStatusApplet]
+Name=XApp Status Applet
+Description=Area where XApp status icons appear
+Icon=panel-applets
+MateComponentId=OAFIID:MATE_MateXAppStatusApplet;
+