diff --git a/Makefile.am b/Makefile.am
index 3e2d6e4dc947..6ba5ac388054 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,218 +1,218 @@
 ACLOCAL_AMFLAGS = -I config
 
 include config/rpm.am
 include config/deb.am
 include config/tgz.am
 
 SUBDIRS = include
 if BUILD_LINUX
 SUBDIRS += rpm
 endif
 
 if CONFIG_USER
 SUBDIRS += etc man scripts lib tests cmd contrib
 if BUILD_LINUX
 SUBDIRS += udev
 endif
 endif
 if CONFIG_KERNEL
 SUBDIRS += module
 
 extradir = $(prefix)/src/zfs-$(VERSION)
 extra_HEADERS = zfs.release.in zfs_config.h.in
 
 if BUILD_LINUX
 kerneldir = $(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION)
 nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
 endif
 endif
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh copy-builtin
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md
 EXTRA_DIST += CODE_OF_CONDUCT.md
 
 # Include all the extra licensing information for modules
 EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE
 EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE.descrip
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.gladman.descrip
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl
 EXTRA_DIST += module/icp/asm-x86_64/aes/THIRDPARTYLICENSE.openssl.descrip
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.cryptogams.descrip
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl
 EXTRA_DIST += module/icp/asm-x86_64/modes/THIRDPARTYLICENSE.openssl.descrip
 EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2
 EXTRA_DIST += module/os/linux/spl/THIRDPARTYLICENSE.gplv2.descrip
 EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash
 EXTRA_DIST += module/zfs/THIRDPARTYLICENSE.cityhash.descrip
 
 @CODE_COVERAGE_RULES@
 
 GITREV = include/zfs_gitrev.h
 
 .PHONY: gitrev
 gitrev:
 	ZFS_GITREV=$$(cd $(top_srcdir) && \
 		git describe --always --long --dirty 2>/dev/null); \
 	ZFS_GITREV=$${ZFS_GITREV:-unknown}; \
 	printf '#define\tZFS_META_GITREV "%s"\n' \
 			"$${ZFS_GITREV}" >$(GITREV)~; \
 	if cmp -s $(GITREV) $(GITREV)~; then \
 		$(RM) $(GITREV)~; \
 	else \
 		mv -f $(GITREV)~ $(GITREV); \
 	fi
 
 $(GITREV): gitrev
 
 BUILT_SOURCES = $(GITREV)
 CLEANFILES = $(GITREV)
 
 # Double-colon rules are allowed; there are multiple independent definitions.
 distclean-local::
 	-$(RM) -R autom4te*.cache build
 	-find . \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
 		-o -name .pc -o -name .hg -o -name .git \) -prune -o \
 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
 		-o -name '.*.rej' -o -size 0 -o -name '*%' -o -name '.*.cmd' \
 		-o -name 'core' -o -name 'Makefile' -o -name 'Module.symvers' \
 		-o -name '*.order' -o -name '*.markers' -o -name '*.gcda' \
 		-o -name '*.gcno' \) \
 		-type f -print | xargs $(RM)
 
 all-local:
 	-[ -x ${top_builddir}/scripts/zfs-tests.sh ] && \
 	    ${top_builddir}/scripts/zfs-tests.sh -c
 
 dist-hook:
-	sed ${ac_inplace} -e 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
+	$(SED) ${ac_inplace} -e 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
 		$(distdir)/META
 
 if BUILD_LINUX
 # For compatibility, create a matching spl-x.y.z directly which contains
 # symlinks to the updated header and object file locations.  These
 # compatibility links will be removed in the next major release.
 if CONFIG_KERNEL
 install-data-hook:
 	rm -rf $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
 	mkdir $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
 	cd $(DESTDIR)$(prefix)/src/spl-$(VERSION) && \
 	ln -s ../zfs-$(VERSION)/include/spl include && \
 	ln -s ../zfs-$(VERSION)/$(LINUX_VERSION) $(LINUX_VERSION) && \
 	ln -s ../zfs-$(VERSION)/zfs_config.h.in spl_config.h.in && \
 	ln -s ../zfs-$(VERSION)/zfs.release.in spl.release.in && \
 	cd $(DESTDIR)$(prefix)/src/zfs-$(VERSION)/$(LINUX_VERSION) && \
 	ln -fs zfs_config.h spl_config.h && \
 	ln -fs zfs.release spl.release
 endif
 endif
 
 codecheck: cstyle shellcheck flake8 mancheck testscheck vcscheck
 
 checkstyle: codecheck commitcheck
 
 commitcheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		${top_srcdir}/scripts/commitcheck.sh; \
 	fi
 
 cstyle:
 	@find ${top_srcdir} -name build -prune -o -type f -name '*.[hc]' \
 		! -name 'zfs_config.*' ! -name '*.mod.c' \
 		! -name 'opt_global.h' ! -name '*_if*.h' \
 		-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+
 
 filter_executable = -exec test -x '{}' \; -print
 
 shellcheck:
 	@if type shellcheck > /dev/null 2>&1; then \
 		shellcheck --exclude=SC1090 --exclude=SC1117 --format=gcc \
 			$$(find ${top_srcdir}/scripts/*.sh -type f) \
 			$$(find ${top_srcdir}/cmd/zed/zed.d/*.sh -type f) \
 			$$(find ${top_srcdir}/cmd/zpool/zpool.d/* \
 			-type f ${filter_executable}); \
 	else \
 		echo "skipping shellcheck because shellcheck is not installed"; \
 	fi
 
 mancheck:
 	@if type mandoc > /dev/null 2>&1; then \
 		find ${top_srcdir}/man/man8 -type f -name 'zfs.8' \
 			-o -name 'zpool.8' -o -name 'zdb.8' \
 			-o -name 'zgenhostid.8' | \
 			xargs mandoc -Tlint -Werror; \
 	else \
 		echo "skipping mancheck because mandoc is not installed"; \
 	fi
 
 if BUILD_LINUX
 stat_fmt = -c '%A %n'
 else
 stat_fmt = -f '%Sp %N'
 endif
 
 testscheck:
 	@find ${top_srcdir}/tests/zfs-tests -type f \
 		\( -name '*.ksh' -not ${filter_executable} \) -o \
 		\( -name '*.kshlib' ${filter_executable} \) -o \
 		\( -name '*.shlib' ${filter_executable} \) -o \
 		\( -name '*.cfg' ${filter_executable} \) | \
 		xargs -r stat ${stat_fmt} | \
 		awk '{c++; print} END {if(c>0) exit 1}'
 
 vcscheck:
 	@if git rev-parse --git-dir > /dev/null 2>&1; then \
 		git ls-files . --exclude-standard --others | \
 		awk '{c++; print} END {if(c>0) exit 1}' ; \
 	fi
 
 lint: cppcheck paxcheck
 
 cppcheck:
 	@if type cppcheck > /dev/null 2>&1; then \
 		cppcheck --quiet --force --error-exitcode=2 --inline-suppr \
 			--suppressions-list=.github/suppressions.txt \
 			-UHAVE_SSE2 -UHAVE_AVX512F -UHAVE_UIO_ZEROCOPY \
 			${top_srcdir}; \
 	else \
 		echo "skipping cppcheck because cppcheck is not installed"; \
 	fi
 
 paxcheck:
 	@if type scanelf > /dev/null 2>&1; then \
 		${top_srcdir}/scripts/paxcheck.sh ${top_srcdir}; \
 	else \
 		echo "skipping paxcheck because scanelf is not installed"; \
 	fi
 
 flake8:
 	@if type flake8 > /dev/null 2>&1; then \
 		flake8 ${top_srcdir}; \
 	else \
 		echo "skipping flake8 because flake8 is not installed"; \
 	fi
 
 ctags:
 	$(RM) tags
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hcS]' -print | xargs ctags -a
 
 etags:
 	$(RM) TAGS
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hcS]' -print | xargs etags -a
 
 cscopelist:
 	find $(top_srcdir) -name '.?*' -prune \
 		-o -type f -name '*.[hc]' -print >cscope.files
 
 tags: ctags etags
 
 pkg: @DEFAULT_PACKAGE@
 pkg-dkms: @DEFAULT_PACKAGE@-dkms
 pkg-kmod: @DEFAULT_PACKAGE@-kmod
 pkg-utils: @DEFAULT_PACKAGE@-utils
diff --git a/cmd/arcstat/Makefile.am b/cmd/arcstat/Makefile.am
index 4b79f4bdd0fb..a0728f9cec1b 100644
--- a/cmd/arcstat/Makefile.am
+++ b/cmd/arcstat/Makefile.am
@@ -1,13 +1,13 @@
 dist_bin_SCRIPTS = arcstat
 
 #
 # The arcstat script is compatible with both Python 2.6 and 3.4.
 # As such the python 3 shebang can be replaced at install time when
 # targeting a python 2 system.  This allows us to maintain a single
 # version of the source.
 #
 if USING_PYTHON_2
 install-exec-hook:
-	sed ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
+	$(SED) ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
 	    $(DESTDIR)$(bindir)/arcstat
 endif
diff --git a/cmd/dbufstat/Makefile.am b/cmd/dbufstat/Makefile.am
index 10c9fbabbf89..f3b7ed809f9b 100644
--- a/cmd/dbufstat/Makefile.am
+++ b/cmd/dbufstat/Makefile.am
@@ -1,13 +1,13 @@
 dist_bin_SCRIPTS = dbufstat
 
 #
 # The dbufstat script is compatible with both Python 2.6 and 3.4.
 # As such the python 3 shebang can be replaced at install time when
 # targeting a python 2 system.  This allows us to maintain a single
 # version of the source.
 #
 if USING_PYTHON_2
 install-exec-hook:
-	sed ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
+	$(SED) ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
 	    $(DESTDIR)$(bindir)/dbufstat
 endif
diff --git a/config/always-sed.m4 b/config/always-sed.m4
index b9c7afd63da3..19633e118aed 100644
--- a/config/always-sed.m4
+++ b/config/always-sed.m4
@@ -1,16 +1,16 @@
 dnl #
 dnl # Set the flags used for sed in-place edits.
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [
-	ac_inplace=""
-	AC_CACHE_CHECK([for sed --in-place], [ac_cv_path_SED],
-		[AC_PATH_PROGS_FEATURE_CHECK([SED], [sed],
-			[[tmpfile=$(mktemp)
-			  echo foo > $tmpfile
-			  $ac_path_SED --in-place 's#foo#bar#' $tmpfile \
-			  && ac_cv_path_SED=$ac_path_SED
-			  rm $tmpfile]],
-			[ac_inplace="-i ''"])])
-	AS_IF([test "x$ac_inplace" = "x"], [ac_inplace="--in-place"])
-	AC_SUBST([ac_inplace])
+	AC_REQUIRE([AC_PROG_SED])dnl
+	AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [
+		tmpfile=$(mktemp conftest.XXX)
+		echo foo >$tmpfile
+		AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null],
+		      [ac_cv_inplace="--in-place"],
+		      [$SED -i '' 's#foo#bar#' $tmpfile 2>/dev/null],
+		      [ac_cv_inplace="-i ''"],
+		      [AC_MSG_ERROR([$SED does not support in-place])])
+	])
+	AC_SUBST([ac_inplace], [$ac_cv_inplace])
 ])
diff --git a/tests/test-runner/bin/Makefile.am b/tests/test-runner/bin/Makefile.am
index e7838e43d3f8..09032ba689ac 100644
--- a/tests/test-runner/bin/Makefile.am
+++ b/tests/test-runner/bin/Makefile.am
@@ -1,15 +1,15 @@
 pkgdatadir = $(datadir)/@PACKAGE@/test-runner/bin
 dist_pkgdata_SCRIPTS = \
 	test-runner.py \
 	zts-report.py
 #
 # These scripts are compatible with both Python 2.6 and 3.4.  As such the
 # python 3 shebang can be replaced at install time when targeting a python
 # 2 system.  This allows us to maintain a single version of the source.
 #
 if USING_PYTHON_2
 install-data-hook:
-	sed ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
+	$(SED) ${ac_inplace} -e 's|^#!/usr/bin/env python3|#!/usr/bin/env python2|' \
 	    $(DESTDIR)$(pkgdatadir)/test-runner.py \
 	    $(DESTDIR)$(pkgdatadir)/zts-report.py
 endif