-EXTRA_DIST = check.sh create-zpool.sh load-zfs.sh unload-zfs.sh
-EXTRA_DIST += profile-kpios-disk.sh profile-kpios-pids.sh
-EXTRA_DIST += profile-kpios-post.sh profile-kpios-pre.sh profile-kpios.sh
-EXTRA_DIST += survey.sh update-zfs.sh zpios-jbod.sh zpios.sh
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+nobase_pkglibexec_SCRIPTS = common.sh
+nobase_pkglibexec_SCRIPTS += zconfig.sh
+nobase_pkglibexec_SCRIPTS += zfs.sh
+nobase_pkglibexec_SCRIPTS += zpool-create.sh
+nobase_pkglibexec_SCRIPTS += zpool-config/*
+nobase_pkglibexec_SCRIPTS += zpios.sh
+nobase_pkglibexec_SCRIPTS += zpios-sanity.sh
+nobase_pkglibexec_SCRIPTS += zpios-survey.sh
+nobase_pkglibexec_SCRIPTS += zpios-test/*
+nobase_pkglibexec_SCRIPTS += zpios-profile/*
+EXTRA_DIST = zfs-update.sh $(nobase_pkglibexec_SCRIPTS)