diff --git a/mk/targets.mk b/mk/targets.mk
index 071410c49c..f7aae21ac7 100644
--- a/mk/targets.mk
+++ b/mk/targets.mk
@@ -63,5 +63,6 @@ sitl-mount: sitl
 
 .PHONY: etags
 etags:
-	cd .. && etags -f ArduCopter/TAGS --langmap=C++:.pde.cpp.h $$(git ls-files ArduCopter libraries)
-
+	cd .. && etags -f ArduCopter/TAGS --lang=c++ $$(git ls-files ArduCopter libraries)
+	cd .. && etags -f ArduPlane/TAGS --lang=c++ $$(git ls-files ArduPlane libraries)
+	cd .. && etags -f APMrover2/TAGS --lang=c++ $$(git ls-files APMrover2 libraries)