diff --git a/Makefile b/Makefile
index 9a683f41c417e014c12ea7d04cc5780deebddb4b..c2b258fe5aa8941496d1642cd5f6cd823685023c 100644
--- a/Makefile
+++ b/Makefile
@@ -95,10 +95,10 @@ INCLUDES		+=	-Ilib/include/ -Iinclude/aarch64/ -Iinclude/	\
 				-Iplat/fvp -Idrivers/power			\
 				-Iarch/system/gic -Icommon/psci
 
-ASFLAGS			+= 	 -D__ASSEMBLY__ $(INCLUDES)
-CFLAGS			:= 	-Wall -std=c99 -c -Os -DDEBUG=$(DEBUG) $(INCLUDES) ${CFLAGS}
+ASFLAGS			+= 	-Wa,--fatal-warnings -D__ASSEMBLY__ ${INCLUDES}
+CFLAGS			:= 	-Wall -Werror -std=c99 -c -Os -DDEBUG=${DEBUG} ${INCLUDES} ${CFLAGS}
 
-LDFLAGS			+=	-O1
+LDFLAGS			+=	--fatal-warnings -O1
 BL1_LDFLAGS		:=	-Map=${BL1_MAPFILE} --script ${BL1_LINKERFILE} --entry=${BL1_ENTRY_POINT}
 BL2_LDFLAGS		:=	-Map=${BL2_MAPFILE} --script ${BL2_LINKERFILE} --entry=${BL2_ENTRY_POINT}
 BL31_LDFLAGS		:=	-Map=${BL31_MAPFILE} --script ${BL31_LINKERFILE} --entry=${BL31_ENTRY_POINT}