diff --git a/.gitignore b/.gitignore
index 57664356..2e06ef53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,11 @@ bcachefs
 *.d
 *.a
 tags
+TAGS
 cscope*
 bcachefs-tools
+tests/test_helper
+tests/__pycache__/
 
 # dot-files that we don't want to ignore
 !.gitignore
diff --git a/Makefile b/Makefile
index 3c3db9bc..eb2798ff 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,13 @@ all: bcachefs
 check: tests/test_helper bcachefs
 	cd tests; $(PYTEST)
 
+.PHONY: TAGS tags
+TAGS:
+	ctags -e -R .
+
+tags:
+	ctags -R .
+
 SRCS=$(shell find . -type f -iname '*.c')
 DEPS=$(SRCS:.c=.d)
 -include $(DEPS)