diff --git a/cmd/Makefile.am b/cmd/Makefile.am
index 6d6de4adb42a..2bd9d039f20e 100644
--- a/cmd/Makefile.am
+++ b/cmd/Makefile.am
@@ -1,116 +1,114 @@
 bin_SCRIPTS =
 bin_PROGRAMS =
 sbin_SCRIPTS =
 sbin_PROGRAMS =
 dist_bin_SCRIPTS =
 zfsexec_PROGRAMS =
 mounthelper_PROGRAMS =
 
 
 sbin_SCRIPTS      += fsck.zfs
 SHELLCHECKSCRIPTS += fsck.zfs
 CLEANFILES        += fsck.zfs
 dist_noinst_DATA  += %D%/fsck.zfs.in
 $(call SUBST,fsck.zfs,%D%/)
 
 
 sbin_PROGRAMS   += zfs_ids_to_path
 CPPCHECKTARGETS += zfs_ids_to_path
 
 zfs_ids_to_path_SOURCES = \
 	%D%/zfs_ids_to_path.c
 
 zfs_ids_to_path_LDADD = \
 	libzfs.la
 
 
 zhack_CPPFLAGS = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
 
 sbin_PROGRAMS   += zhack
 CPPCHECKTARGETS += zhack
 
 zhack_SOURCES = \
 	%D%/zhack.c
 
 zhack_LDADD = \
 	libzpool.la \
 	libzfs_core.la \
 	libnvpair.la
 
 
 ztest_CFLAGS    = $(AM_CFLAGS) $(KERNEL_CFLAGS)
-# Get rid of compiler warning for unchecked truncating snprintfs on gcc 7.1.1
-ztest_CFLAGS   += $(NO_FORMAT_TRUNCATION)
 ztest_CPPFLAGS  = $(AM_CPPFLAGS) $(FORCEDEBUG_CPPFLAGS)
 
 sbin_PROGRAMS   += ztest
 CPPCHECKTARGETS += ztest
 
 ztest_SOURCES = \
 	%D%/ztest.c
 
 ztest_LDADD = \
 	libzpool.la \
 	libzfs_core.la \
 	libnvpair.la
 
 ztest_LDADD += -lm
 ztest_LDFLAGS = -pthread
 
 
 include $(srcdir)/%D%/raidz_test/Makefile.am
 include $(srcdir)/%D%/zdb/Makefile.am
 include $(srcdir)/%D%/zfs/Makefile.am
 include $(srcdir)/%D%/zinject/Makefile.am
 include $(srcdir)/%D%/zpool/Makefile.am
 include $(srcdir)/%D%/zpool_influxdb/Makefile.am
 include $(srcdir)/%D%/zstream/Makefile.am
 
 
 if BUILD_LINUX
 mounthelper_PROGRAMS += mount.zfs
 CPPCHECKTARGETS      += mount.zfs
 
 mount_zfs_SOURCES = \
 	%D%/mount_zfs.c
 
 mount_zfs_LDADD = \
 	libzfs.la \
 	libzfs_core.la \
 	libnvpair.la
 
 mount_zfs_LDADD += $(LTLIBINTL)
 
 CPPCHECKTARGETS += raidz_test
 
 
 sbin_PROGRAMS   += zgenhostid
 CPPCHECKTARGETS += zgenhostid
 
 zgenhostid_SOURCES = \
 	%D%/zgenhostid.c
 
 
 dist_bin_SCRIPTS  += %D%/zvol_wait
 SHELLCHECKSCRIPTS += %D%/zvol_wait
 
 
 include $(srcdir)/%D%/zed/Makefile.am
 endif
 
 
 if USING_PYTHON
 bin_SCRIPTS      += arc_summary     arcstat        dbufstat        zilstat
 CLEANFILES       += arc_summary     arcstat        dbufstat        zilstat
 dist_noinst_DATA += %D%/arc_summary %D%/arcstat.in %D%/dbufstat.in %D%/zilstat.in
 
 $(call SUBST,arcstat,%D%/)
 $(call SUBST,dbufstat,%D%/)
 $(call SUBST,zilstat,%D%/)
 arc_summary: %D%/arc_summary
 	$(AM_V_at)cp $< $@
 endif
 
 
 PHONY += cmd
 cmd: $(bin_SCRIPTS) $(bin_PROGRAMS) $(sbin_SCRIPTS) $(sbin_PROGRAMS) $(dist_bin_SCRIPTS) $(zfsexec_PROGRAMS) $(mounthelper_PROGRAMS)
diff --git a/config/Rules.am b/config/Rules.am
index 2e463ae6083a..30c5f353cd23 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -1,71 +1,73 @@
 #
 # Default build rules for all user space components, every Makefile.am
 # should include these rules and override or extend them as needed.
 #
 
 PHONY =
 AM_CPPFLAGS = \
 	-include $(top_builddir)/zfs_config.h \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/module/icp/include \
 	-I$(top_srcdir)/lib/libspl/include \
 	-I$(top_srcdir)/lib/libspl/include/os/@ac_system_l@
 
 AM_LIBTOOLFLAGS = --silent
 
 AM_CFLAGS  = -std=gnu99 -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wno-sign-compare -Wno-missing-field-initializers
 AM_CFLAGS += -fno-strict-aliasing
 AM_CFLAGS += $(NO_OMIT_FRAME_POINTER)
 AM_CFLAGS += $(IMPLICIT_FALLTHROUGH)
 AM_CFLAGS += $(DEBUG_CFLAGS)
 AM_CFLAGS += $(ASAN_CFLAGS)
 AM_CFLAGS += $(UBSAN_CFLAGS)
-AM_CFLAGS += $(CODE_COVERAGE_CFLAGS) $(NO_FORMAT_ZERO_LENGTH)
+AM_CFLAGS += $(CODE_COVERAGE_CFLAGS)
+AM_CFLAGS += $(NO_FORMAT_ZERO_LENGTH)
+AM_CFLAGS += $(NO_FORMAT_TRUNCATION)
 if BUILD_FREEBSD
 AM_CFLAGS += -fPIC -Werror -Wno-unknown-pragmas -Wno-enum-conversion
 AM_CFLAGS += -include $(top_srcdir)/include/os/freebsd/spl/sys/ccompile.h
 AM_CFLAGS += -I/usr/include -I/usr/local/include
 endif
 
 AM_CPPFLAGS += -D_GNU_SOURCE
 AM_CPPFLAGS += -D_REENTRANT
 AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
 AM_CPPFLAGS += -D_LARGEFILE64_SOURCE
 AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
 AM_CPPFLAGS += -DZFSEXECDIR=\"$(zfsexecdir)\"
 AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
 AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
 AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
 AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CPPFLAGS += $(DEBUG_CPPFLAGS)
 AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
 AM_CPPFLAGS += -DTEXT_DOMAIN=\"zfs-@ac_system_l@-user\"
 
 if ASAN_ENABLED
 AM_CPPFLAGS += -DZFS_ASAN_ENABLED
 endif
 
 if UBSAN_ENABLED
 AM_CPPFLAGS += -DZFS_UBSAN_ENABLED
 endif
 
 AM_LDFLAGS  = $(DEBUG_LDFLAGS)
 AM_LDFLAGS += $(ASAN_LDFLAGS)
 AM_LDFLAGS += $(UBSAN_LDFLAGS)
 
 if BUILD_FREEBSD
 AM_LDFLAGS += -fstack-protector-strong -shared
 AM_LDFLAGS += -Wl,-x -Wl,--fatal-warnings -Wl,--warn-shared-textrel
 AM_LDFLAGS += -lm
 endif
 
 
 # If a target includes kernel code, generate warnings for large stack frames
 KERNEL_CFLAGS       = $(FRAME_LARGER_THAN)
 
 # See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54020
 LIBRARY_CFLAGS      = -no-suppress
 
 # Forcibly enable asserts/debugging for libzpool &al.
 FORCEDEBUG_CPPFLAGS = -DDEBUG -UNDEBUG -DZFS_DEBUG