diff --git a/Makefile b/Makefile
index 471cf59825e47b2b2c052f8afc212f6bb7f93e0b..c4730929315619c1eafe0bf3413d8a605cdbf460 100644
--- a/Makefile
+++ b/Makefile
@@ -256,9 +256,14 @@ WARNINGS	+=		-Wunused -Wno-unused-parameter	\
 				-Wvla
 
 ifeq ($(findstring clang,$(notdir $(CC))),)
+# not using clang
 WARNINGS	+=		-Wunused-but-set-variable	\
 				-Wmaybe-uninitialized		\
-				-Wpacked-bitfield-compat
+				-Wpacked-bitfield-compat	\
+				-Wshift-overflow=2
+else
+# using clang
+WARNINGS	+=		-Wshift-overflow -Wshift-sign-overflow
 endif
 
 ifneq (${E},0)