diff --git a/fm-common/sources/Makefile b/fm-common/sources/Makefile
index 70fc7fb4..7b1ea031 100755
--- a/fm-common/sources/Makefile
+++ b/fm-common/sources/Makefile
@@ -7,6 +7,7 @@ CLI_OBJS = fm_cli.o
 LDLIBS = -lstdc++ -lrt -luuid -lpq -lpthread -lpython2.7
 INCLUDES = -I./ -I$(shell pg_config --includedir)
 CCFLAGS = -g -O2 -Wall -Werror -fPIC
+EXTRACCFLAGS= -Wformat -Wformat-security
 
 MAJOR ?= 1
 MINOR ?= 0
diff --git a/fm-mgr/sources/Makefile b/fm-mgr/sources/Makefile
index 3eea46dc..0d683c36 100755
--- a/fm-mgr/sources/Makefile
+++ b/fm-mgr/sources/Makefile
@@ -4,6 +4,7 @@ OBJS = fm_main.o
 OBJS = $(SRCS:.cpp=.o)
 INCLUDES = -I.
 CCFLAGS = -g -O2 -Wall -Werror
+EXTRACCFLAGS = -Wformat -Wformat-security
 
 MAJOR ?= 1
 MINOR ?= 0
diff --git a/snmp-audittrail/sources/Makefile b/snmp-audittrail/sources/Makefile
index ad00ce66..6f7469c6 100644
--- a/snmp-audittrail/sources/Makefile
+++ b/snmp-audittrail/sources/Makefile
@@ -3,7 +3,7 @@ SRCS = snmpAuditPlugin.c
 OBJS = $(SRCS:.c=.o)
 LDLIBS = -lfmcommon -lnetsnmp -lnetsnmpagent -luuid
 INCLUDES += -I./
-CCFLAGS = -fPIC -g -O2 -Wall -Werror
+CCFLAGS = -fPIC -g -O2 -Wall -Werror -Wformat -Wformat-security
 LIBCGTSAGENT_SO := libsnmpAuditPlugin.so
 MAJOR ?= 1
 MINOR ?= 0
diff --git a/snmp-ext/sources/Makefile b/snmp-ext/sources/Makefile
index fe2a328e..07d004fc 100644
--- a/snmp-ext/sources/Makefile
+++ b/snmp-ext/sources/Makefile
@@ -3,9 +3,9 @@ SRCS = cgtsActiveAlarms.c cgtsAgentPlugin.c cgtsEventLogs.c
 OBJS = $(SRCS:.c=.o)
 LDLIBS = -lfmcommon -lnetsnmp -lnetsnmpagent -luuid
 INCLUDES += -I./
-CCFLAGS = -fPIC -g -O2 -Wall -Werror
+CCFLAGS = -fPIC -g -O2 -Wall -Werror -Wformat -Wformat-security
 LIBCGTSAGENT_SO := libcgtsAgentPlugin.so
-build: lib 
+build: lib
 
 .c.o:
 	$(CXX) $(CCFLAGS) $(INCLUDES) -c $< -o $@
@@ -16,7 +16,7 @@ lib: $(OBJS)
 	ln -sf $(LIBCGTSAGENT_SO).$(MAJOR).$(MINOR).$(PATCH) $(LIBCGTSAGENT_SO)
 
 clean:
-	@rm -f $(OBJ) *.o *.so.* 
+	@rm -f $(OBJ) *.o *.so.*
 
 install_non_bb:
 	install -m 755 -d $(DEST_DIR)$(LIB_DIR)