diff --git a/.gitignore b/.gitignore
index 776be9b..ee08549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ main_ram.bin
 tests/*/*.bin
 tests/*/*.hex
 tests/*/*.elf
+TAGS
diff --git a/Makefile b/Makefile
index 2f90f22..8c3133d 100644
--- a/Makefile
+++ b/Makefile
@@ -146,10 +146,16 @@ test_micropython: core_tb
 test_micropython_long: core_tb
 	@./scripts/test_micropython_long.py
 
+TAGS:
+	find . -name '*.vhdl' | xargs ./scripts/vhdltags
+
+.PHONY: TAGS
+
 clean:
 	rm -f *.o work-*cf unisim-*cf $(all)
 	rm -f fpga/*.o fpga/work-*cf
 	rm -f sim-unisim/*.o sim-unisim/unisim-*cf
+	rm -f TAGS
 
 distclean: clean
 	rm -f *~ fpga/~
diff --git a/scripts/vhdltags b/scripts/vhdltags
new file mode 100755
index 0000000..76983b7
--- /dev/null
+++ b/scripts/vhdltags
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Etags is case sensitive so parsing VHDL is a little ugly.
+
+FILES=""
+OUTPUTFILE=TAGS
+
+while [ "$1"x != "x" ] ; do
+    case $1 in
+    -o)
+	shift
+	OUTPUTFILE=$1
+	;;
+    *)
+	FILES="$FILES $1"
+	;;
+    esac
+    shift
+done
+
+etags --language=none \
+      --regex='/[ \t]*\([Aa][Rr][Cc][Hh][Ii][Tt][Ee][Cc][Tt][Uu][Rr][Ee]\)[ \t]+\([^ \t]*\)[ \t]+\(OF\|of\)[ \t]+\([^ \t]*\)/\4-\2/' \
+      --regex='/[ \t]*\([Cc][Oo][Nn][Ff][Ii][Gg][Uu][Rr][Aa][Tt][Ii][Oo][Nn]\)[ \t]+\([^ \t]*\)[ \t]+\(OF\|of\)[ \t]+\([^ \t]*\)/\2/' \
+      --regex='/[ \t]*\('\
+'[Aa][Tt][Tt][Rr][Ii][Bb][Uu][Tt][Ee]\|'\
+'[Ee][Nn][Tt][Ii][Tt][Yy]\|'\
+'[Ff][Uu][Nn][Cc][Tt][Ii][Oo][Nn]\|'\
+'[Pp][Aa][Cc][Kk][Aa][Gg][Ee]\([ \t]+[Bb][Oo][Dd][Yy]\)?\|'\
+'[Pp][Rr][Oo][Cc][Ee][Dd][Uu][Rr][Ee]\|'\
+'[Pp][Rr][Oo][Cc][Ee][Ss][Ss]\|'\
+'[Tt][Yy][Pp][Ee]\|'\
+'[Ss][Uu][Bb][Tt][Yy][Pp][Ee]'\
+'\)[ \t]+\([^ \t(]+\)/\3/' \
+      --regex='/[ \t]*\([Cc][Oo][Nn][Ss][Tt][Aa][Nn][Tt]\)[ \t]+\([^ \t]+\)/\2/' \
+      -o "$OUTPUTFILE" $FILES