diff --git a/Makefile.am b/Makefile.am
index 54d300e7d4..11e45dae82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ include $(top_srcdir)/config/Rules.am
 include $(top_srcdir)/config/CppCheck.am
 include $(top_srcdir)/config/Shellcheck.am
 include $(top_srcdir)/config/Substfiles.am
+include $(top_srcdir)/scripts/Makefile.am
 
 ACLOCAL_AMFLAGS = -I config
 
@@ -23,7 +24,6 @@ include $(srcdir)/%D%/contrib/Makefile.am
 include $(srcdir)/%D%/etc/Makefile.am
 include $(srcdir)/%D%/lib/Makefile.am
 include $(srcdir)/%D%/man/Makefile.am
-include $(srcdir)/%D%/scripts/Makefile.am
 include $(srcdir)/%D%/tests/Makefile.am
 if BUILD_LINUX
 include $(srcdir)/%D%/udev/Makefile.am
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 79719e621b..4175d27ea3 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,11 +1,4 @@
 scriptsdir = $(datadir)/$(PACKAGE)
-dist_scripts_SCRIPTS = \
-	%D%/zfs-helpers.sh \
-	%D%/zfs-tests.sh \
-	%D%/zfs.sh \
-	%D%/zimport.sh \
-	%D%/zloop.sh
-
 dist_noinst_SCRIPTS = \
 	%D%/commitcheck.sh \
 	%D%/common.sh.in \
@@ -18,6 +11,19 @@ dist_noinst_SCRIPTS = \
 	%D%/paxcheck.sh \
 	%D%/zfs-tests-color.sh
 
+scripts_scripts = \
+	%D%/zfs-helpers.sh \
+	%D%/zfs-tests.sh \
+	%D%/zfs.sh \
+	%D%/zimport.sh \
+	%D%/zloop.sh
+
+if CONFIG_USER
+dist_scripts_SCRIPTS = $(scripts_scripts)
+else
+dist_noinst_SCRIPTS += $(scripts_scripts)
+endif
+
 dist_noinst_DATA += \
 	%D%/cstyle.pl \
 	%D%/enum-extract.pl \