diff --git a/pam_kwallet.changes b/pam_kwallet.changes
index 2b062e6..0003192 100644
--- a/pam_kwallet.changes
+++ b/pam_kwallet.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar  7 11:43:16 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Don't set LIBEXEC_INSTALL_DIR at build time, the variable is
+  unused since plasma 5.22.
+- Use %_libexecdir
+- Make pam_wallet-common noarch
+
 -------------------------------------------------------------------
 Tue Feb 22 16:21:02 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/pam_kwallet.spec b/pam_kwallet.spec
index 33a2755..8757b27 100644
--- a/pam_kwallet.spec
+++ b/pam_kwallet.spec
@@ -57,6 +57,7 @@ Summary:        Support files for the KWallet PAM module
 Group:          System/GUI/KDE
 Requires:       kwalletd5
 Requires:       socat
+BuildArch:      noarch
 
 %description common
 This package contains support files used by the KWallet PAM
@@ -69,9 +70,8 @@ module.
   # Before usrmerge, the PAM module goes into /lib*/security/
   %{cmake_kf5 -d build -- \
   %if !0%{?usrmerged}
-      -DKDE_INSTALL_LIBDIR=/%{_lib} \
+      -DKDE_INSTALL_LIBDIR=/%{_lib}
   %endif
-      -DLIBEXEC_INSTALL_DIR=%{_kf5_libexecdir}
   }
 
   %cmake_build
@@ -109,7 +109,7 @@ module.
 %files common
 %license LICENSES/*
 %config %{_kf5_configdir}/autostart/pam_kwallet_init.desktop
-%{_kf5_libexecdir}/pam_kwallet_init
+%{_libexecdir}/pam_kwallet_init
 %{_userunitdir}/plasma-kwallet-pam.service
 
 %changelog