diff --git a/config/meson.build b/config/meson.build
index 003d22339b..38b433907a 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -23,7 +23,7 @@ endforeach
 
 install_data('extmap.conf', install_dir: pkgconfdir)
 
-install_data('netatalk-dbus.conf', install_dir: prefix / 'etc/dbus-1/system.d')
+install_data('netatalk-dbus.conf', install_dir: pkgconfdir / 'dbus-1/system.d')
 
 install_data('README', install_dir: localstatedir / 'netatalk')
 
diff --git a/meson.build b/meson.build
index 0a237054f6..4416c9f951 100644
--- a/meson.build
+++ b/meson.build
@@ -33,15 +33,13 @@ target_os = target_machine.system()
 prefix = get_option('prefix')
 exec_prefix = get_option('prefix')
 bindir = prefix / get_option('bindir')
+datadir = prefix / get_option('datadir')
+includedir = prefix / get_option('includedir')
 libdir = prefix / get_option('libdir')
 localstatedir = prefix / get_option('localstatedir')
 mandir = prefix / get_option('mandir')
-sbindir = prefix / get_option('sbindir')
-datadir = prefix / get_option('datadir')
-includedir = prefix / get_option('includedir')
-optdir = prefix / 'opt'
 pkgconfdir = prefix / get_option('sysconfdir')
-tallocdir = optdir / 'talloc/include'
+sbindir = prefix / get_option('sbindir')
 
 ##################
 # Compiler flags #