diff --git a/Makefile b/Makefile
index a3b7b71096e85492aa0f94f734650ae15fa405d8..b5363db27e50648e2ca09f910b46311d02351d56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 CC = gcc
-CFLAGS = -O2 -Wall -g
+
+-include ../Makefile.diag.inc
+CFLAGS = -O2 -g $(DIAG_CFLAGS) -Werror
 
 LIBETH_CFLAGS += -I. -I../libeasy
 LIBETH_LDFLAGS += -L../libeasy