diff --git a/config/CppCheck.am b/config/CppCheck.am
index e53013bd01cc..987094258a84 100644
--- a/config/CppCheck.am
+++ b/config/CppCheck.am
@@ -4,7 +4,7 @@
 
 PHONY += cppcheck
 
-CPPCHECKFLAGS  = --std=c99 --quiet --max-configs=1 --error-exitcode=2
+CPPCHECKFLAGS  = --std=c11 --quiet --max-configs=1 --error-exitcode=2
 CPPCHECKFLAGS += --inline-suppr -U_KERNEL
 
 cppcheck:
diff --git a/config/Rules.am b/config/Rules.am
index e483b9ef800c..370d3b23483e 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -23,7 +23,7 @@ endif
 
 AM_LIBTOOLFLAGS = --silent
 
-AM_CFLAGS  = -std=gnu99 -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wno-sign-compare -Wno-missing-field-initializers
+AM_CFLAGS  = -std=gnu11 -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Wno-sign-compare -Wno-missing-field-initializers
 AM_CFLAGS += -fno-strict-aliasing
 AM_CFLAGS += $(NO_OMIT_FRAME_POINTER)
 AM_CFLAGS += $(IMPLICIT_FALLTHROUGH)
diff --git a/module/Kbuild.in b/module/Kbuild.in
index 1507965c5750..0ffd8cad64e7 100644
--- a/module/Kbuild.in
+++ b/module/Kbuild.in
@@ -16,7 +16,7 @@ ifneq ($(KERNELRELEASE),)
 
 obj-$(CONFIG_ZFS) := $(ZFS_MODULES)
 
-ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
+ZFS_MODULE_CFLAGS += -std=gnu11 -Wno-declaration-after-statement
 ZFS_MODULE_CFLAGS += -Wmissing-prototypes
 ZFS_MODULE_CFLAGS += @KERNEL_DEBUG_CFLAGS@  @NO_FORMAT_ZERO_LENGTH@
 
diff --git a/module/Makefile.in b/module/Makefile.in
index 762f9394dd20..d7beb2a0698d 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -120,7 +120,7 @@ modules_uninstall-FreeBSD:
 modules_uninstall: modules_uninstall-@ac_system@
 
 cppcheck-Linux:
-	@CPPCHECK@ -j@CPU_COUNT@ --std=c99 --quiet --force --error-exitcode=2 \
+	@CPPCHECK@ -j@CPU_COUNT@ --std=c11 --quiet --force --error-exitcode=2 \
 		--inline-suppr \
 		--suppress=unmatchedSuppression \
 		--suppress=noValidConfiguration \