diff --git a/silecs-communication-cpp/Makefile b/silecs-communication-cpp/Makefile
index df95e10961d67c06c2abc896d0ca53e176062e10..3cd818f6b3d938c0dbea9760dce3aac7f80b036a 100644
--- a/silecs-communication-cpp/Makefile
+++ b/silecs-communication-cpp/Makefile
@@ -36,7 +36,7 @@ PATCH ?= 0
 COMPILER_FLAGS = -DMAJOR=$(MAJOR) -DMINOR=$(MINOR) -DPATCH=$(PATCH)
 
 #Enable C++11 Support
-COMPILER_FLAGS += -std=c++11
+COMPILER_FLAGS += -std=c++11 -Wall -Wextra
 
 ifdef NI_SUPPORT_ENABLED
 COMPILER_FLAGS += -DNI_SUPPORT_ENABLED=TRUE