diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk
index 6f5e956dfa..148889e4c5 100644
--- a/libraries/AP_Common/Arduino.mk
+++ b/libraries/AP_Common/Arduino.mk
@@ -159,7 +159,7 @@ endif
 # Tool options
 #
 DEFINES			=	-DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS)
-OPTFLAGS		=	-Os -Wformat
+OPTFLAGS		=	-Os -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wformat=2
 DEPFLAGS		=	-MD -MT $@
 
 # XXX warning options TBD