diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2fbbbf3334..66b07ac15c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Fri Jan 28 15:40:33 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+	* a29k-tdep.c (examine_tag): Add comment regarding argcount.
+
 	* remote-mips.c (mips_ops): Fix docstring.
 
 	* remote-bug.c (bug_ops): Remove spurious newline from docstring.
diff --git a/gdb/a29k-tdep.c b/gdb/a29k-tdep.c
index 7d02b8bcde..04d1fd24db 100644
--- a/gdb/a29k-tdep.c
+++ b/gdb/a29k-tdep.c
@@ -362,7 +362,11 @@ examine_tag(p, is_trans, argcount, msize, mfp_used)
 	 *msize = tag1 & 0x7ff;
     }
   if (is_trans)
-    *is_trans = ((tag1 & (1<<21)) ? 1 : 0); 
+    *is_trans = ((tag1 & (1<<21)) ? 1 : 0);
+  /* Note that this includes the frame pointer and the return address
+     register, so the actual number of registers of arguments is two less.
+     argcount can be zero, however, sometimes, for strange assembler
+     routines.  */
   if (argcount)
     *argcount = (tag1 >> 16) & 0x1f;
   if (mfp_used)