diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 30315af486..bca83b606a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (TAGS): Avoid warning from etags when $GDB_NM_FILE is
+	empty.  See http://sourceware.org/ml/gdb-patches/2012-08/msg00504.html
+	and http://sourceware.org/ml/gdb-patches/2013-04/msg00055.html for
+	details of the problem.
+
 2013-04-04  Pedro Alves  <palves@redhat.com>
 	    Hui Zhu  <hui@codesourcery.com>
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 47b4338282..c9ae6f6aa0 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1208,7 +1208,7 @@ gdb1$(EXEEXT): gdb$(EXEEXT)
 GDB_NM_FILE = @GDB_NM_FILE@
 TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
 	@echo Making TAGS
-	@etags $(srcdir)/$(GDB_NM_FILE) \
+	etags `(test -n "$(GDB_NM_FILE)" && echo "$(srcdir)/$(GDB_NM_FILE)")` \
 	`(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
 		echo $(srcdir)/$$i ; \
 	done ; for i in $(TAGFILES_WITH_SRCDIR); do \