diff --git a/Makefile b/Makefile
index 09f8d5d942..2a4b3f335e 100644
--- a/Makefile
+++ b/Makefile
@@ -301,7 +301,7 @@ test speed: all
 	$(MAKE) -C tests $@
 
 TAGS:
-	etags *.[ch] tests/*.[ch]
+	etags *.[ch] tests/*.[ch] block/*.[ch] hw/*.[ch]
 
 cscope:
 	rm -f ./cscope.*