diff --git a/contrib/bash_completion.d/Makefile.am b/contrib/bash_completion.d/Makefile.am
index 4f451fb1d8..dc4b610c42 100644
--- a/contrib/bash_completion.d/Makefile.am
+++ b/contrib/bash_completion.d/Makefile.am
@@ -1,6 +1,7 @@
-noinst_DATA  = %D%/zfs
-EXTRA_DIST  += $(noinst_DATA)
-SUBSTFILES  += $(noinst_DATA)
+bashcompletiondir = $(sysconfdir)/bash_completion.d
 
-SHELLCHECKSCRIPTS += $(noinst_DATA)
-$(call SHELLCHECK_OPTS,$(noinst_DATA)): SHELLCHECK_SHELL = bash
+nodist_bashcompletion_DATA  = %D%/zfs
+SUBSTFILES                 += $(nodist_bashcompletion_DATA)
+
+SHELLCHECKSCRIPTS   += $(nodist_bashcompletion_DATA)
+$(call SHELLCHECK_OPTS,$(nodist_bashcompletion_DATA)): SHELLCHECK_SHELL = bash
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 4b78a93085..0a29601639 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -518,6 +518,8 @@ systemctl --system daemon-reload >/dev/null || true
 %config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
+%config(noreplace) %{_sysconfdir}/bash_completion.d/zfs
+
 %files -n libzpool5
 %{_libdir}/libzpool.so.*