diff --git a/Makefile b/Makefile
index 71eedd7..00b4344 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,9 @@ TEST_OBJECTS := $(patsubst $(TEST_DIR)/%.cpp, $(BUILD_DIR)/%.o, $(TEST_SOURCES))
 
 LIBRARY = $(BUILD_DIR)/liborbit.a
 
+# Default target (updates ctags if available)
 all: lib test-build
+	@command -v ctags >/dev/null 2>&1 && ctags -R tests/ src/ || true
 
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)