diff --git a/meson.build b/meson.build
index 278f5a2c3..c7c0bfc58 100644
--- a/meson.build
+++ b/meson.build
@@ -928,7 +928,7 @@ meson.add_install_script(
   nm_bindir,
   nm_pkgconfdir,
   nm_pkglibdir,
-  nm_localstatedir,
+  nm_pkgstatedir,
   enable_docs ? 'install_docs' : '',
   nm_mandir
 )
diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh
index fd21941bb..8a60ce33c 100755
--- a/tools/meson-post-install.sh
+++ b/tools/meson-post-install.sh
@@ -4,7 +4,7 @@ datadir=$1
 bindir=$2
 pkgconfdir=$3
 pkglibdir=$4
-localstatedir=$5
+pkgstatedir=$5
 
 [ -n "$DESTDIR" ] && DESTDIR=${DESTDIR%%/}/
 
@@ -26,12 +26,15 @@ for dir in "${pkgconfdir}/conf.d" \
            "${pkgconfdir}/dispatcher.d/pre-up.d" \
            "${pkgconfdir}/dnsmasq.d" \
            "${pkgconfdir}/dnsmasq-shared.d" \
-           "${pkgconfdir}/conf.d" \
-           "${pkgconfdir}/VPN" \
-           "${localstatedir}/lib/NetworkManager"; do
+           "${pkglibdir}/conf.d" \
+           "${pkglibdir}/VPN"; do
     mkdir -p "${DESTDIR}${dir}"
+    chmod 0755 "${DESTDIR}${dir}"
 done
 
+mkdir -p "${DESTDIR}${pkgstatedir}"
+chmod 0700 "${DESTDIR}${pkgstatedir}"
+
 if [ "$6" = install_docs ]; then
     mandir=$7