diff --git a/Makefile.am b/Makefile.am
index 9df706dceb0..7257617b8e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,12 @@ init-db:		all
 bin-dist:		all
 	$(top_builddir)/scripts/make_binary_distribution
 
+tags:
+	rm -f TAGS
+	find -not -path \*SCCS\* -and \
+	\( -name \*.cc -or -name \*.h -or -name \*.yy -or -name \*.c \) \
+	-print -exec etags -o TAGS --append {} \;
+
 .PHONY:		init-db bin-dist
 
 # Test installation
diff --git a/build-tags b/build-tags
deleted file mode 100755
index 90b957eb3bc..00000000000
--- a/build-tags
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-if [ ! -f configure.in ] ; then
- echo "$0 must be run from MySQL source root"
- exit 1
-fi
-
-rm -f TAGS
-find -not -path \*SCCS\* -and \
- \( -name \*.cc -or -name \*.h -or -name \*.yy -or -name \*.c \) \
- -print -exec etags -o TAGS --append {} \;