diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk
index cbce48c6bc..0ff6796b31 100644
--- a/libraries/AP_Common/Arduino.mk
+++ b/libraries/AP_Common/Arduino.mk
@@ -327,13 +327,13 @@ HARDWARE_CORE		:=	$(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2)
 UPLOAD_SPEED		:=	$(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2)
 
 ifeq ($(UPLOAD_PROTOCOL),)
-UPLOAD_PROTOCOL		:=	$(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2)
+  UPLOAD_PROTOCOL	:=	$(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2)
 endif
 
 # Adding override for mega since boards.txt uses stk500 instead of
 # arduino on 22 release
-ifeq ($(BOARD),"mega")
-UPLOAD_PROTOCOL := "arduino"
+ifeq ($(BOARD),mega)
+  UPLOAD_PROTOCOL	:=	arduino
 endif
 
 ifeq ($(MCU),)