diff --git a/data/meson.build b/data/meson.build
index ad34149a..627f46d3 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,28 +1,22 @@
-preferences_desktop_data = configuration_data()
-preferences_desktop_data.set('VERSION', meson.project_version())
+common_desktop_data = configuration_data()
+common_desktop_data.set('VERSION', meson.project_version())
 
 preferences_desktop = configure_file(
   input: 'mate-power-preferences.desktop.in.in',
   output: 'mate-power-preferences.desktop.in',
-  configuration: preferences_desktop_data
+  configuration: common_desktop_data
 )
 
-statistics_desktop_data = configuration_data()
-statistics_desktop_data.set('VERSION', meson.project_version())
-
 statistics_desktop = configure_file(
   input: 'mate-power-statistics.desktop.in.in',
   output: 'mate-power-statistics.desktop.in',
-  configuration: statistics_desktop_data
+  configuration: common_desktop_data
 )
 
-mpm_autostart_data = configuration_data()
-mpm_autostart_data.set('VERSION', meson.project_version())
-
 mpm_autostart = configure_file(
   input: 'mate-power-manager.desktop.in.in',
   output: 'mate-power-manager.desktop.in',
-  configuration: mpm_autostart_data
+  configuration: common_desktop_data
 )
 
 mpm_service_data = configuration_data()
@@ -81,8 +75,7 @@ install_man(
     'mate-power-backlight-helper.1',
     'mate-power-statistics.1',
     'mate-power-preferences.1'
-  ],
-  install_dir: mandir_path
+  ]
 )
 
 install_data(
diff --git a/meson_options.txt b/meson_options.txt
index c8ed4eff..f3f1a884 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('enable-deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages')
+option('deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages')
 option('keyring', type: 'feature', value: 'auto', description: 'Enable the use of gnome-keyring')
 option('applets', type: 'feature', value: 'enabled', description: 'Build the extra power applets')
 option('with-dbus-services', type: 'string', description: 'where D-BUS services directory is')