1diff --git a/data/meson.build b/data/meson.build
2index 53f31cb4..90f40e77 100644
3--- a/data/meson.build
4+++ b/data/meson.build
5@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli',
6 )
7
8 install_data('appstream.conf',
9- install_dir: get_option('sysconfdir'))
10+ install_dir: get_option('prefix') / 'etc')
11
12 if get_option('compose')
13 ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml'
14diff --git a/meson.build b/meson.build
15index 2efe86b7..9dc79e28 100644
16--- a/meson.build
17+++ b/meson.build
18@@ -107,12 +107,12 @@ if get_option ('gir')
19 dependency('gobject-introspection-1.0', version: '>=1.56')
20 endif
21
22-stemmer_inc_dirs = include_directories(['/usr/include'])
23+stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
24 if get_option('stemming')
25 stemmer_lib = cc.find_library('stemmer', required: true)
26 if not cc.has_header('libstemmer.h')
27 if cc.has_header('libstemmer/libstemmer.h')
28- stemmer_inc_dirs = include_directories('/usr/include/libstemmer')
29+ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer')
30 else
31 error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.')
32 endif