diff --git a/ChangeLog b/ChangeLog
index 220b5573c583774c1f876aeec44d9f174c27199c..be3ca719b723c2969cd1886a1287c9f69c5cf24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-26  Niels M�ller  <nisse@lysator.liu.se>
+
+	* Makefile.in (tags-here): Put TAGS file in the source directory.
+	* examples/Makefile.in (tags): Likewise.
+	* testsuite/Makefile.in (tags): Likewise.
+	* tools/Makefile.in (tags): Likewise.
+
 2008-02-29  Niels M�ller  <nisse@lysator.liu.se>
 
 	* examples/Makefile.in (SOURCES): Added next-prime.c.
diff --git a/Makefile.in b/Makefile.in
index 360cd913ab00c99bdec191cf76650befa8c1932a..cbf3de1c9e834157d25b81f0062db2e5acde8680 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -413,7 +413,7 @@ maintainer-clean-here:
 	-rm -f $(DOCTARGETS) *.dvi *.ps
 
 tags-here:	
-	etags $(srcdir)/*.c $(srcdir)/*.h
+	etags -o $(srcdir)/TAGS $(srcdir)/*.c $(srcdir)/*.h
 
 DEP_FILES = $(SOURCES:.c=.$(OBJEXT).d) $(SOURCES:.c=.p$(OBJEXT).d)
 @DEP_INCLUDE@ $(DEP_FILES)
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 8b2953bede9c2e7d00aa0ca55481981894297bdb..8dd7ed000c913d3dc08d5f7298674c9032103722 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -88,6 +88,6 @@ distclean: clean
 	-rm -f Makefile *.d
 
 tags:
-	etags --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
+	etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
 
 @DEP_INCLUDE@ $(SOURCES:.c=.$(OBJEXT).d)
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index a5b5ec62113f0a6cbadcbad23a28183d810cf53d..22812f5f1dc5921e3bcbc0cef04284e843892acf 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -100,6 +100,6 @@ distclean: clean
 	-rm -f Makefile *.d
 
 tags:
-	etags --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
+	etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
 
 @DEP_INCLUDE@ $(SOURCES:.c=.$(OBJEXT).d)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 7ceb0e19cbc7c6947c97623882e4378340094a2a..18bd62ec4d147d76eae50bef3201d58fe67b58b0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -75,6 +75,6 @@ distclean: clean
 	-rm -f Makefile *.d
 
 tags:
-	etags --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
+	etags -o $(srcdir)/TAGS --include $(top_srcdir) $(srcdir)/*.c $(srcdir)/*.h
 
 @DEP_INCLUDE@ $(SOURCES:.c=.$(OBJEXT).d)