diff --git a/guest-agent/guest-scale-agent-2.0/Makefile b/guest-agent/guest-scale-agent-2.0/Makefile
index 0a2cf192..43f20275 100644
--- a/guest-agent/guest-scale-agent-2.0/Makefile
+++ b/guest-agent/guest-scale-agent-2.0/Makefile
@@ -1,7 +1,7 @@
 #
 #   BSD LICENSE
 #
-#   Copyright(c) 2013-2016, Wind River Systems, Inc. 
+#   Copyright(c) 2013-2016, Wind River Systems, Inc.
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -34,7 +34,7 @@
 
 EXECS = guest_scale_helper guest_scale_agent
 
-CFLAGS= -g -Wall
+CFLAGS= -g -Wall  -Wformat -Wformat-security
 ODIR=obj
 BINDIR=bin
 
@@ -64,7 +64,7 @@ printvars:
 
 .PHONY: printvars
 
-all: host_all 
+all: host_all
 host_all: $(BINEXECS) sdk/$(EXPORT_SDK).tgz
 
 # The dependency tracking for the SDK tarball is rather crude.  If any
diff --git a/guest-client/guest-client-3.0.1/guest_client/src/Makefile b/guest-client/guest-client-3.0.1/guest_client/src/Makefile
index 9b3ab8e3..864f52da 100755
--- a/guest-client/guest-client-3.0.1/guest_client/src/Makefile
+++ b/guest-client/guest-client-3.0.1/guest_client/src/Makefile
@@ -1,5 +1,5 @@
 #
-#   Copyright(c) 2013-2016, Wind River Systems, Inc. 
+#   Copyright(c) 2013-2016, Wind River Systems, Inc.
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -66,6 +66,7 @@ program_BUILD_OBJS := $(addprefix $(BUILD_DIR)/, $(heartbeat_C_OBJS))
 program_BUILD_OBJS += $(addprefix $(BUILD_DIR)/, $(program_C_OBJS))
 
 CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir)
+CFLAGS += -Wformat-security
 
 all: build
 
diff --git a/guest-client/guest-client-3.0.1/guest_client/src/heartbeat/Makefile b/guest-client/guest-client-3.0.1/guest_client/src/heartbeat/Makefile
index 0c74c670..b9d9ec33 100755
--- a/guest-client/guest-client-3.0.1/guest_client/src/heartbeat/Makefile
+++ b/guest-client/guest-client-3.0.1/guest_client/src/heartbeat/Makefile
@@ -1,5 +1,5 @@
 #
-#   Copyright(c) 2013-2016, Wind River Systems, Inc. 
+#   Copyright(c) 2013-2016, Wind River Systems, Inc.
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -54,7 +54,7 @@ heartbeat_C_INCLUDES += -I$(CURRENT_DIR)/../../../include
 heartbeat_C_SRCS := $(wildcard *.c)
 heartbeat_C_OBJS := ${heartbeat_C_SRCS:.c=.o}
 
-CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir)
+CFLAGS = -g -O2 -Wall -Werror -Wformat -DSYSCONFDIR=$(sysconfdir) -Wformat-security
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(heartbeat_C_INCLUDES) -c $< -o $(BUILD_DIR)/$@ -ljson-c
diff --git a/guest-client/guest-client-3.0.1/guest_client_api/Makefile b/guest-client/guest-client-3.0.1/guest_client_api/Makefile
index 0e68d8a5..4fce699d 100755
--- a/guest-client/guest-client-3.0.1/guest_client_api/Makefile
+++ b/guest-client/guest-client-3.0.1/guest_client_api/Makefile
@@ -1,5 +1,5 @@
 #
-#   Copyright(c) 2013-2016, Wind River Systems, Inc. 
+#   Copyright(c) 2013-2016, Wind River Systems, Inc.
 #
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
@@ -72,7 +72,7 @@ sample_C_OBJS := ${sample_C_SRCS:.c=.o}
 sample_LDLIBS :=  -L$(BUILD_DIR) -l$(common_NAME) -l$(heartbeat_NAME) -lrt
 sample_BUILD_OBJS := $(addprefix $(BUILD_DIR)/, $(sample_C_OBJS))
 
-CFLAGS = -g -O2 -Wall -Werror -Wformat -fPIC -DSYSCONFDIR=$(sysconfdir)
+CFLAGS = -g -O2 -Wall -Werror -Wformat -fPIC -DSYSCONFDIR=$(sysconfdir) -Wformat-security
 
 all: build
 
diff --git a/guest-comm/host-guest-comm-2.0/Makefile.sdk b/guest-comm/host-guest-comm-2.0/Makefile.sdk
index 84d4c62f..0c18a119 100644
--- a/guest-comm/host-guest-comm-2.0/Makefile.sdk
+++ b/guest-comm/host-guest-comm-2.0/Makefile.sdk
@@ -27,14 +27,14 @@
 #   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 #   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 
+#
 
 .PHONY: all clean
 
 EXECS= guest_agent server_group_app
 
-CFLAGS= -g -Wall
-LDFLAGS = 
+CFLAGS= -g -Wall -Wformat -Wformat-security
+LDFLAGS =
 
 ODIR=obj
 BINDIR=bin
@@ -51,7 +51,7 @@ GUEST_CLIENT_APP_SRCS = server_group_app.c
 GUEST_CLIENT_APP_OBJ := $(patsubst %,$(ODIR)/%,$(GUEST_CLIENT_APP_SRCS:.c=.o))
 
 LIBGUESTHOSTMSG_SRCS := lib_guest_host_msg.c
-LIBGUESTHOSTMSG_INCLUDES := guest_host_msg.h 
+LIBGUESTHOSTMSG_INCLUDES := guest_host_msg.h
 LIBGUESTHOSTMSG_OBJ := $(patsubst %,$(ODIR)/%,$(LIBGUESTHOSTMSG_SRCS:.c=.o))
 LIBGUESTHOSTMSG := guesthostmsg
 LIBGUESTHOSTMSG_SO := $(patsubst %,lib%.so,$(LIBGUESTHOSTMSG))